diff --git a/10/21.txt b/10/21.txt
index c5704d2..cecc255 100644
--- a/10/21.txt
+++ b/10/21.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 21 Sheme, mogolowe Japhete a tsholelwa barwa. Gape Sheme e ne e le rragwe batho botlhe ba Ebere. \v 22 Barwa Sheme e ne e le Elama, Ashure, Arafasate, Ludi le Arama. \v 23 Barwa Arama e ne ele Usa, Hula, Gethare le Mesheke.
-=======
-\v 21 Shemi le ene one a tshola barwa, e bong mogolowe Jafethe. Shemi e ne ele rragwemogolo batho botlhe ba Ebere. \v 22 Bo morwa Shemi ke Elame, Asesure, Arepakesate, Lute le Arame. \v 23 Bo morwa Arame ke Use, Hole, Gathere, le Mase.
->>>>>>> d09def89fe64ac47a1e8ca6362ae9f8613f5f140
+\v 21 Sheme, e leng mogolowe Japhete le ene a tshola barwa. Sheme gape e ne e le rragwe batho botlhe ba Ebere. \v 22 Barwa Sheme e ne e le Elama, Ashure, Arafasate, Ludi le Arama. \v 23 Barwa Arama e ne ele Usa, Hula, Gethare le Mesheke.
\ No newline at end of file