diff --git a/src/main.py b/src/main.py
index 02066ae..31c5c07 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,10 +3,7 @@
 import sys
 import getopt
 from SchedulingAlgorithms import simanneal as sim
-<<<<<<< HEAD
-=======
 from Output import output as o
->>>>>>> origin/devel
 
 
 def usage():