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