Fixed merge problems

Author: fabapp2

components/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteMember.java

@@ -110,7 +110,6 @@ public boolean hasAnnotation(String annotationFqName) {
     @Override
     public void addAnnotation(String fqName) {
         String snippet = "@" + fqName.substring(fqName.lastIndexOf('.') + 1);
-        AddAnnotationVisitor addAnnotationVisitor = new AddAnnotationVisitor(() -> javaParserBuilder, getVariableDeclarations(), snippet, fqName);
         AddAnnotationVisitor addAnnotationVisitor = new AddAnnotationVisitor(() -> javaParserBuilder.getBuilder(), getVariableDeclarations(), snippet, fqName);
         refactoring.refactor(rewriteSourceFileHolder, addAnnotationVisitor);
     }

sbm-support-rewrite/src/test/java/org/springframework/sbm/parsers/RewriteProjectParserIntegrationTest.java

@@ -97,18 +97,6 @@ void parseResources() {
         assertThat(parsingResult.sourceFiles()).hasSize(5);
     }
 
-    @Test
-    @DisplayName("parse4Modules")
-    void parse4Modules() {
-        Path baseDir = getMavenProject("4-modules");
-        List<Resource> resources = projectScanner.scan(baseDir);
-
-        assertThat(resources).hasSize(4);
-
-        RewriteProjectParsingResult parsingResult = sut.parse(baseDir, resources, new InMemoryExecutionContext(t -> {throw new RuntimeException(t);}));
-        assertThat(parsingResult.sourceFiles()).hasSize(4);
-    }
-
     private Path getMavenProject(String s) {
         return Path.of("./testcode/maven-projects/").resolve(s).toAbsolutePath().normalize();
     }