diff --git a/10/02.txt b/10/02.txt
index c9e8479..3857269 100644
--- a/10/02.txt
+++ b/10/02.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 2 Bo morwa Jafete ke Gomere le Magoge, le Matai, le Jafane le Tubale, le Mesheke le Tirase. \v 3 Bo morwa Gomere ke Ashekenase, Ruphathe le Togarama. \v 4 Bo morwa Jafane ke Elishaba, Tarashishi, Kitime, le Totanimi. \v 5 Batho    ba letshitshi la lewatle ba kgaogana ka mafatshe, lengwe le lengwe lena le puo ya lone , go ya ka fa dikgotlaneng le ka fa ditshabeng tsa bone.
-=======
-\v 2 Bo morwa Jafethe ke Gomere, Magoge, matai, Jafone, Tubale, Meseke, le Tirase. \v 3 Bo morwa Gomere ke Asekenase, Rifathe, le Togarema. \v 4 Bo morwa Jafane ne ele  Elisha, Taresise, Kitime, Dotanime. \v 5 Go tswa fa batho ba setlhaketlhake sa lewatle bane ba kgaogane mme mongwe le mongwe wa bone a tsamaya ko lefatsheng la bone, mongwe le mongwe ka teme ya bone, go yeng ka ditshika, le ka Chaba ya bone.
->>>>>>> d09def89fe64ac47a1e8ca6362ae9f8613f5f140
+\v 2 Bo morwa Jafete e ne e le Gomere, Magoge, Matai, Jafane,Tubale, Mesheke le Tirase. \v 3 Bo morwa Gomere e ne e le Ashekenase, Ruphathe le Togarama. \v 4 Bo morwa Jafane ke Elishaba, Tarashishi, Kitime, le Totanimi. \v 5 Batho    ba letshitshi la lewatle ba kgaogana ka mafatshe, lengwe le lengwe lena le puo ya lone , go ya ka fa dikgotlaneng le ka fa ditshabeng tsa bone.
\ No newline at end of file