diff --git a/26/23.txt b/26/23.txt
index 1717e87..a724965 100644
--- a/26/23.txt
+++ b/26/23.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-\v 23 Mono,"Nyi,ka yaklani limmana lari ta koba weha enu olega Nauwa,yikna kama lajaga Nauwa. \v 24 Anana Kadadi ata enga kakoNa tujjawe kama tolha tutuna Nyi.Tabolo,li lokowela halina ata nada,orona nyi Anana Kadadi ata ba malajani! Atna rehi dahha hoge ata nada nyi aina dadi memahe." \v 25 Bege Yudas,kama lajanai Yesus,linage tabaraNa"Walle nauwagna,Rabi?" Yesus linage tabarana,"Yau um takki wikki dauwe." LIHA NAMU TUTU TAUNA MONO RANAI KRISTUS
-=======
 \v 23 Mono,"Nyi,ka yaklani limmana lari ta koba weha enu olega Nauwa,yikna kama lajaga Nauwa. \v 24 Anana Kadadi ata enga kakoNa tujjawe kama tolha tutuna Nyi.Tabolo,li lokowela halina ata nada,orona nyi Anana Kadadi ata ba malajani! Atna rehi dahha hoge ata nada nyi aina dadi memahe." \v 25 Bege Yudas,kama lajanai Yesus,linage tabaraNa"Walle nauwagna,Rabi?" Yesus linage tabarana,"Yau um takki wikki dauwe."
-LIHA NAMU TUTU TAUNA MONO RANAI KRISTUS
->>>>>>> 1758b158914702ae6ead0ebc68af3fe381840842
+LIHA NAMU TUTU TAUNA MONO RANAI KRISTUS
\ No newline at end of file
diff --git a/26/33.txt b/26/33.txt
index 1079cee..85e9fbc 100644
--- a/26/33.txt
+++ b/26/33.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-\v 33 Petrus linage,"lokko tangada bada widdakna oroMu,nauwa enga walegu widak mawa." \v 34 Linagei Yesus tabarana,"Nauwa luguge katau takkana tabarami tagadi inne mema,manu aina kuku hoyi,yau um kabaluga Nauwa hadallu wudana." \v 35 Petrus linage tabaraNa,"Lokko nauwa bagu mate dangaGu,nauwa walegu kaballuk magu Yau!" Tangada ana hakodo wadeka lida kahha jalage. YESUS NA SEMBAYANGNA TA GETSEMANI
-=======
 \v 33 Petrus linage,"lokko tangada bada widdakna oroMu,nauwa enga walegu widak mawa." \v 34 Linagei Yesus tabarana,"Nauwa luguge katau takkana tabarami tagadi inne mema,manu aina kuku hoyi,yau um kabaluga Nauwa hadallu wudana." \v 35 Petrus linage tabaraNa,"Lokko nauwa bagu mate dangaGu,nauwa walegu kaballuk magu Yau!" Tangada ana hakodo wadeka lida kahha jalage.
-YESUS NA SEMBAYANGNA TA GETSEMANI
->>>>>>> 1758b158914702ae6ead0ebc68af3fe381840842
+YESUS NA SEMBAYANGNA TA GETSEMANI
\ No newline at end of file
diff --git a/26/36.txt b/26/36.txt
index a126a31..2549acb 100644
--- a/26/36.txt
+++ b/26/36.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 36 Bege Yesus dikki oledi ana hakodoNa tahha dau ka ngarana Getsemani mono Nyi linage ta ana hakodoNa,"Ngodomila inne,tamaragu Nauwa banedaga bali bagu sembayangna." \v 37 Mono,Nyi nangidiyi Petrus mono kadudana anai Zebedeus oleni Nyi,mono Nyi kapu nage maropowe atena. \v 38 Bege,Nyi linage tabarada yidda,"AteGu marabeha hinguwe,bagu padage mera nage mate.Engamila inne mono engamila ha inyaka bamu olega Nauwa."
-=======
-\v Bege Yesus dikki oledi ana hakodoNa tahha dau ka ngarana Getsemani mono Nyi linage ta ana hakodoNa,"Ngodomila inne,tamaragu Nauwa banedaga bali bagu sembayangna." \v 37 Mono,Nyi nangidiyi Petrus mono kadudana anai Zebedeus oleni Nyi,mono Nyi kapu nage maropowe atena. \v 38 Bege,Nyi linage tabarada yidda,"AteGu marabeha hinguwe,bagu padage mera nage mate.Engamila inne mono engamila ha inyaka bamu olega Nauwa."
->>>>>>> 1758b158914702ae6ead0ebc68af3fe381840842
+\v 36 \v Bege Yesus dikki oledi ana hakodoNa tahha dau ka ngarana Getsemani mono Nyi linage ta ana hakodoNa,"Ngodomila inne,tamaragu Nauwa banedaga bali bagu sembayangna." \v 37 Mono,Nyi nangidiyi Petrus mono kadudana anai Zebedeus oleni Nyi,mono Nyi kapu nage maropowe atena. \v 38 Bege,Nyi linage tabarada yidda,"AteGu marabeha hinguwe,bagu padage mera nage mate.Engamila inne mono engamila ha inyaka bamu olega Nauwa."
\ No newline at end of file
diff --git a/26/55.txt b/26/55.txt
index 8980139..a3d461e 100644
--- a/26/55.txt
+++ b/26/55.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-\v 55 Ta mahiggo neda Yesus linage tabarada ata buta,"Appa natujawe gabana parampok mi mamu ngidmi katopo mono palu todo bamu yapawa Nauwa? Diha lado-dihha lado,Nauwa ug ngodowa ta Umma Allah mono mi walem yapak mawa Nauwa. \v 56 Ta nyiduwe,tangage inna na dadiwe kana banuge hatakki ta jurata nabi." Bewalge,tangada ana hakodo tanani Nyi mono malai dage. TANGADA PA AMA YAHUDI DA HOKUNI YESUS
-=======
 \v 55 Ta mahiggo neda Yesus linage tabarada ata buta,"Appa natujawe gabana parampok mi mamu ngidmi katopo mono palu todo bamu yapawa Nauwa? Diha lado-dihha lado,Nauwa ug ngodowa ta Umma Allah mono mi walem yapak mawa Nauwa. \v 56 Ta nyiduwe,tangage inna na dadiwe kana banuge hatakki ta jurata nabi." Bewalge,tangada ana hakodo tanani Nyi mono malai dage.
-TANGADA PA AMA YAHUDI DA HOKUNI YESUS
->>>>>>> 1758b158914702ae6ead0ebc68af3fe381840842
+TANGADA PA AMA YAHUDI DA HOKUNI YESUS
\ No newline at end of file
diff --git a/27/57.txt b/27/57.txt
index c13c6cd..9df7db6 100644
--- a/27/57.txt
+++ b/27/57.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 57 Kole mata laddo manari gaknage,ammini wu ata pote wali ta Arimatea ka ngaranai Yusuf,nyi dummo na dadi ana hakodo beni Yesus. \v 58 na kako tai Pilatus karayiwe karaogonai Yesus.Lohho,Pilatus nahalewayi kana haburruge karogonai Yesus mo yiwe tabaranai Yusuf.
-=======
-\v 57 Kole mata laddo manari gaknage,ammini wu ata pote wali ta Arimatea ka ngaranai Yusuf,nyi dummo na dadi ana hakodo beni Yesus.\v Nyi na kako tai Pilatus karayiwe karaogonai Yesus.Lohho,Pilatus nahalewayi kana haburruge karogonai Yesus mo yiwe tabaranai Yusuf.
->>>>>>> 1758b158914702ae6ead0ebc68af3fe381840842
+\v 58 \v 57 Kole mata laddo manari gaknage,ammini wu ata pote wali ta Arimatea ka ngaranai Yusuf,nyi dummo na dadi ana hakodo beni Yesus.\v Nyi na kako tai Pilatus karayiwe karaogonai Yesus.Lohho,Pilatus nahalewayi kana haburruge karogonai Yesus mo yiwe tabaranai Yusuf.
\ No newline at end of file