diff --git a/src/EasyGA.py b/src/EasyGA.py
index eb76e85..88e5914 100644
--- a/src/EasyGA.py
+++ b/src/EasyGA.py
@@ -21,13 +21,6 @@ class gene:
     def get_value(self):
         return self.value
 
-<<<<<<< HEAD
-=======
-    # Should the gene creation of the genes-veriation be
-    # included in the gene class or should the use just
-    # assign value to the gene and we move on?
-
->>>>>>> 70c9e443a58e7efe5d2cc9e31a129c190ac43b98
 class chromosome:
     # Defults
         # fitness = double, genes = [gene,gene,gene,etc]