Merge pull request #1105 from lightbend/fix_parent_circleci

chore: restoring parent branch in circleci

Author: octonato

.circleci/config.yml

@@ -14,7 +14,7 @@ commands:
             git config user.email "[email protected]"
             git config user.name "CircleCI"
       - build-tools/merge-with-parent:
-          parent: spring-sdk # we need to revert this when merging back into main
+          parent: main
 
   install-java-11:
     description: install openjdk-11