Conflict leftovers?

source/Collection_Data_Types.rst

@@ -359,15 +359,6 @@ In the first algorithm.
 | so for each kmer we read all the sequence so the algorithm is in O( 4\ :sup:`kmer length` * ``sequence length``)
 
 | In the second algorithm we read the sequence only once
-=======
-In the first algorithm.
-
-| we first compute all kmers we generate 4\ :sup:`kmer length`
-| then we count the occurrence of each kmer in the sequence
-| so for each kmer we read all the sequence so the algorithm is in O( 4\ :sup:`kmer length` * ``sequence length``)
-
-| In the secon algorithm we read the sequence only once
->>>>>>> e986fb63db27fe063adb907bfb916dbb79c5db9b
 | So the algorithm is in O(sequence length)