diff --git a/07/15.txt b/07/15.txt
index 4ba8ffa..09ea260 100644
--- a/07/15.txt
+++ b/07/15.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Ovina muinjo ko vivari vivari veja ku Noah nu avi hiti mo tjitendeze.  \v 16 Ovipuka mbi via hita vari ovitume no vikaze vio vina muinjo avihe; via hita moukoto otja imba Mukuru tje mu raa. Tjana Jehova a pata omujero.
-=======
-\v 15 Ovina muinjo ko vivari vivari veja ku Noah no avihiti motjitendeze. \v 16 Ovipuka mbia hita viare ovitume no vikaze vio vina muinjo avihe;Via hita moukuto otja Mukuru tje mu raera.Tjazumba Ngambi apata omujero.
->>>>>>> fe8d2bdf92345d4422400df86924a6b923858908
+\v 15 Ovina muinjo ko vivari vivari veja ku Noah nu avi hiti mo tjitendeze. \v 16 Ovipuka mbi via hita vari ovitume no vikaze vio vina muinjo avihe; via hita moukoto otja imba Mukuru tje mu raa. Tjana Jehova a pata omujero.
\ No newline at end of file
diff --git a/07/17.txt b/07/17.txt
index 63eca26..7ffcd70 100644
--- a/07/17.txt
+++ b/07/17.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Nu omupupo ueja kombanda jehi omajuva omirongo vine, nu omeva aje riueza nu aje jere otji tendeze kombanda jehi.  \v 18 Omeva jasiringa ehi, nu otji tendeze atji tendeze kombanda jo meva.
-=======
-\v 17 Nu omupupo ueja kombanda jehi omajuva o mirongo vine,nu omeva ajeriuesa ajejere otjitendeze kombanda jehi. \v 18 Omeva jasiringa jehi,nu otjitendeze atjitendeza kombanda jomeva,
->>>>>>> fe8d2bdf92345d4422400df86924a6b923858908
+\v 17 Nu omupupo ueja kombanda jehi omajuva o mirongo vine,nu omeva ajeriuesa ajejere otjitendeze kombanda jehi. \v 18 Omeva jasiringa jehi,nu otjitendeze atjitendeza kombanda jomeva,
\ No newline at end of file