diff --git a/10/19.txt b/10/19.txt
index 89452e5..ec28558 100644
--- a/10/19.txt
+++ b/10/19.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Molelwane wa Bakanana one o simolola ko Sitone, mo ntlheng ya Gerara go wela ko Gasa jaaka o tsamaela ko Sotoma le Gomora, le Atema, le Seboime go fitlha kwa Lasha. \v 20 Bao ke bo morwa Hame ka dikgotlana tsa bone, le diteme tsa bone mo mafatsheng a bone, mo ditshabeng tsa bone.
-=======
-\v 19 Mololwane wa Bakanana one o simolola go tswa ko Sitone, wa tsamaela ntlhe ya Gararego ya go tsena ko Gasa, go ya ntlheng ya Sotoma, Gomora, Atema, le Seboime, go fitlha ko Lasa. \v 20 Ba ene ele barwa Hame, go yeng ka ditshika tsa bone, ka puo ya bone mo mafatsheng a bone, mo chabeng ya bone.
->>>>>>> d09def89fe64ac47a1e8ca6362ae9f8613f5f140
+\v 19 Molelwane wa Bakanana one o simolola kwa Sitone, mo ntlheng ya Gerara go wela ko Gasa jaaka o tsamaela ko Sotoma, Gomora, Atema, le Seboime go fitlha kwa Lasha. \v 20 Bao ke bo morwa Hame, ka dikgotlana tsa bone, le diteme tsa bone mo mafatsheng a bone, mo ditshabeng tsa bone.
\ No newline at end of file