diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
index 2b03b38a..4b4fa686 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
@@ -136,17 +136,12 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 			//PL 2020-10-16: Ab hier GGenerics implementieren durch Ali
 			//Rueckgabe an generatedGenericsForSF
 			fogg = new FamilyOfGeneratedGenerics(tphExtractor);
-<<<<<<< HEAD
-			System.out.println("fogg: "+ fogg.methodConstraintsWithPosition);
-			
-			/*
-=======
 			System.out.println("fogg.allConstraints: "+ fogg.allConstraints);
 			System.out.println("fogg.posOfTPHs: "+ fogg.posOfTPHs);
 			System.out.println("fogg.classConstraints: "+ fogg.classConstraints);
 			System.out.println("fogg.methodConstraintsWithPosition: "+ fogg.methodConstraintsWithPosition);
 
->>>>>>> fc8f11ebb1d4d900b2611616b89a1f24f054e9b4
+			/*
 			tphsClass = tphExtractor.tphsClass;
 			//PL 2020-01-15
 			//Es muss ggResult aus fogg gebildet werden
@@ -158,10 +153,10 @@ public class GeneratedGenericsFinder implements ASTVisitor {
 
 			for(Method m : classOrInterface.getMethods()) {
 				addMethodConstraints(simplifiedConstraints, ggResult, m);
-				
+
 			}
 			*/
-			
+
 			if(ggResult != null)
 				generatedGenericsForSF.addGenericGeneratorResultClass(ggResult);
 				System.out.println("ddd");