diff --git a/10/11.txt b/10/11.txt
index 8c4fe1a..1514de5 100644
--- a/10/11.txt
+++ b/10/11.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 11 A tswa mo lefatsheng leo a ya kwa Asiria , a aga Ninefe le Rehobotheire, le Kala, \v 12 le Resene fa gare ga Ninife le Kala. O e leng motse o mogolo. \v 13 Mosarime ya rragwe Baludi, le Baaname,le Balehabi,le \v 14 Banafetuhi, ba Phatharusi, Bakaseluni ( ba go duleng Bafilisitia mo go bone) le Bakefetori.
-=======
-\v 11 Fa a tswa mo lefatsheng leo a ya Arisia a bo a aga Ninefe, Rehobotheire, Kala, \v 12 le Resene yo o neng ale fa gare ha Ninefe le Kala. Ene ele toropo e tona thata . \v 13 Miseraime a nna rraagwe Ba ludime, Baaname, Balehabim, Banafetotime, \v 14 Bapatherusime, Bakaseluhime (fa go tswang Bafilisitia), le Kefetorime.
->>>>>>> d09def89fe64ac47a1e8ca6362ae9f8613f5f140
+\v 11 A tswa mo lefatsheng leo a ya kwa Asiria , a aga Ninefe le Rehobothe, le Kala, \v 12 le Resene, yo o neng ale fa gare ga Ninife le Kala. e ne e le motse o mogolo. \v 13 Mosarime ya rragwe Baludi, le Baaname,le Balehabi,le \v 14 Banafetuhi, ba Phatharusi, Bakaseluni ( ba go duleng Bafilisitia mo go bone) le Bakefetori.
\ No newline at end of file