diff --git a/02/11.txt b/02/11.txt
index 0d83bba4..e6a2564e 100644
--- a/02/11.txt
+++ b/02/11.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 11 Be ekin din ketim embe na zang Idun-n eyi ayii ngi Mariyamu, be kekep itsari akyip mi. Ba afven buda ebi eki ba nda mi buda ni orup otin ni khilir, faranakanse, ba atir ayi mur.\v 12  Ikpe kya be khelai kyong be fe ese irim edin obu ni Hirudus eye kong, ening, ba apu uken ebi unyin mbe edin khehin embe.
-=======
-\v 11 Be kin eding ketim embe na zang Idung-n nyi eyi ayi ngi Meri. Be khip itsari arak mi. Ba vung ada ibi ke banda mi bunda ni gol, frankinsen eyi myrh. \v 12 Ikpe kya bi khelai kyong bi fu esi irim eding kobu ni Hero eye kong, ba nyin ezeng ukeng awu mbe eding kehen ibi.
->>>>>>> fb2aa095632fa4f429ac9b929bff2e2832d6a237
+\v 11 Be kin eding ketim embe na zang Idung-n nyi eyi ayi ngi Meri. Be khip itsari arak mi. Ba vung ada ibi ke banda mi bunda ni gol, frankinsen eyi myrh. \v 12 Ikpe kya bi khelai kyong bi fu esi irim eding kobu ni Hero eye kong, ba nyin ezeng ukeng awu mbe eding kehen ibi.
\ No newline at end of file