diff --git a/Makefile b/Makefile
index e7aa480..0ea1faa 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,6 @@ P2=
 
 
 all: $(CLASSES) $(FXMLS_BUILD)
-<<<<<<< HEAD
 	$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBRARIES) $(CLASSES) -d $(BUILDS)
 
 run: $(CLASSES)
@@ -45,15 +44,6 @@ run: $(CLASSES)
 
 simulate: $(CLASSES)
 	$(JAVA) -cp $(BUILDS):$(LIBRARIES) $(MAIN) $(N)
-=======
-	$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(BUILDS)
-
-run: $(CLASSES)
-	$(JAVA) -cp $(BUILDS):$(LIBARIES) $(MAIN) $(P1) $(P2)
-
-simulate: $(CLASSES)
-	$(JAVA) -cp $(BUILDS):$(LIBARIES) $(MAIN) $(N)
->>>>>>> master
 
 doc: $(CLASSES)
 	$(JAVADOC) $(JAVADOC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(DOC)