diff --git a/src/initialization/chromosome_structure/chromosome.py b/src/initialization/chromosome_structure/chromosome.py
index 5c481da..420e107 100644
--- a/src/initialization/chromosome_structure/chromosome.py
+++ b/src/initialization/chromosome_structure/chromosome.py
@@ -1,17 +1,12 @@
-<<<<<<< Updated upstream
-class chromosome:
-    
-    # fitness = Empty; genes = [gene, gene, gene, etc.]
-=======
 class Chromosome:
 
->>>>>>> Stashed changes
     def __init__(self, genes = None):
         if genes is None:
             self.genes = []
         else:
             self.genes = genes
         self.fitness = None
+        self.selected = False
 
     def add_gene(self, gene, index = -1):
         if index == -1:
diff --git a/src/initialization/gene_structure/gene.py b/src/initialization/gene_structure/gene.py
index 456340b..bd13b54 100644
--- a/src/initialization/gene_structure/gene.py
+++ b/src/initialization/gene_structure/gene.py
@@ -3,12 +3,8 @@ def check_gene(value):
     assert value != "" , "Gene can not be empty"
     return value
 
-<<<<<<< Updated upstream
-class gene:
-=======
 class Gene:
 
->>>>>>> Stashed changes
     def __init__(self, value):
         self.fitness = None
         self.value = check_gene(value)
@@ -22,12 +18,8 @@ class Gene:
     def set_fitness(self, fitness):
         self.fitness = fitness
 
-<<<<<<< Updated upstream
-    def set_value(self):
-=======
     def set_value(self, value):
         """Set value of the gene"""
->>>>>>> Stashed changes
         self.value = value
 
     def __repr__(self):
diff --git a/src/initialization/population_structure/population.py b/src/initialization/population_structure/population.py
index 63b2951..44b9435 100644
--- a/src/initialization/population_structure/population.py
+++ b/src/initialization/population_structure/population.py
@@ -21,12 +21,8 @@ class Population:
         del self.chromosomes[index]
 
     def get_all_chromosomes(self):
-<<<<<<< Updated upstream
-        return chromosomes
-=======
         """returns all chromosomes in the population"""
         return self.chromosomes
->>>>>>> Stashed changes
 
     def get_fitness(self):
         return self.fitness