diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
index 843ee359..75285c64 100644
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -288,17 +288,7 @@ public class JavaTXCompiler {
         Set<Set<UnifyPair>> results = new HashSet<>();
         UnifyResultModel urm = null;
         try {
-<<<<<<< HEAD
-			Writer logFile = new Writer() {//new FileWriter(new File(System.getProperty("user.dir")+"/src/test/java/logFiles/"+"log_"+sourceFiles.keySet().iterator().next().getName()));
-				public void  close() {}
-				public void  flush() {}
-				public void  write(char[] cbuf, int off, int len) { }
-			};
-			
-=======
         	logFile = logFile == null ? new FileWriter(new File("log_"+sourceFiles.keySet().iterator().next().getName())) : logFile;
-
->>>>>>> 7cb2eed36edfe2d9f3ec4ce5c0ca40702dcff7f2
 			IFiniteClosure finiteClosure = UnifyTypeFactory.generateFC(allClasses,logFile);
 			System.out.println(finiteClosure);
 			urm = new UnifyResultModel(cons, finiteClosure);