diff --git a/19/28.txt b/19/28.txt
index ffb07d3..cf289a4 100644
--- a/19/28.txt
+++ b/19/28.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 28 Bwe baawuliire ne baizula obusungu ne batumulira waigulu nga bakoba nti Atemi w'Abaefeso mukulu. \v 29 Ekibuga kyonakyona ne kizula okwetabula kuno; ne bafubutuka n'omwoyo gumu okutuuka mu teyatero, bwe baamalire okukwata Gayo ne Alisutaluuko, ab'e Makedoni, abaatambulanga ne Pawulo.
-=======
-\v 28BwebaawuliirenebaizulaobusungunebatumulirawaigulungabakobantiAtemi w'Abaefesomukulu. \v 29Ekibugakyonakyonanekizulaokwetabulakuno;nebafubutukan'omwoyogumuokutuuka muteyatero,bwebaamalireokukwataGayoneAlisutaluuko,ab'eMakedoni,abaatambulangane Pawulo.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 28 Bwe baawuliire ne baizula obusungu ne batumulira waigulu nga bakoba nti Atemi w'Abaefeso mukulu. \v 29 Ekibuga kyonakyona ne kizula okwetabula kuno; ne bafubutuka n'omwoyo gumu okutuuka mu teyatero, bwe baamalire okukwata Gayo ne Alisutaluuko, ab'e Makedoni, abaatambulanga ne Pawulo.
\ No newline at end of file
diff --git a/19/30.txt b/19/30.txt
index 03c21cf..2744021 100644
--- a/19/30.txt
+++ b/19/30.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 30 Pawulo bwe yatakire okuyingira mu bantu, abayigirizwa ne batamwikirirya. \v 31 Era abakulu abamu aba Asiya, ababbaire mikwanu gye, ne bamulingirira nga bamwegayirira aleke okwewaayo mu teyatero. \v 32 Abamu ne batumulira waigulu bundi, n'abandi bundi, kubanga ekibiina kyabbaire kyetabwire, so n'abandi bangi ne batategeera nsonga ebakuŋaanyizirye.
-=======
-\v 30Pawulobweyatakireokuyingiramubantu,abayigirizwanebatamwikirirya. \v 31EraabakuluabamuabaAsiya,ababbairemikwanugye,nebamulingirirangabamwegayirira alekeokwewaayomuteyatero. \v 32Abamunebatumulirawaigulubundi,n'abandibundi,kubangaekibiinakyabbairekyetabwire, son'abandibanginebatategeeransongaebakuŋaanyizirye.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 30 Pawulo bwe yatakire okuyingira mu bantu, abayigirizwa ne batamwikirirya. \v 31 Era abakulu abamu aba Asiya, ababbaire mikwanu gye, ne bamulingirira nga bamwegayirira aleke okwewaayo mu teyatero. \v 32 Abamu ne batumulira waigulu bundi, n'abandi bundi, kubanga ekibiina kyabbaire kyetabwire, so n'abandi bangi ne batategeera nsonga ebakuŋaanyizirye.
\ No newline at end of file
diff --git a/19/33.txt b/19/33.txt
index b9e488d..df1b08c 100644
--- a/19/33.txt
+++ b/19/33.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 33 Ne batoola Alegezanda mu kibiina, Abayudaaya nga bamusindiikirirya. Alegezanda n'abawenya n'omukono n'ataka okwenyonyola eri abantu. \v 34 Naye bwe baamutegeire nga Muyudaaya, bonabona ne batumulira waigulu n'eidoboozi limu okumala ng'essaawa ibiri nti Atemi w'Abaefeso mukulu.
-=======
-\v 33NebatoolaAlegezandamukibiina,Abayudaayangabamusindiikirirya.Alegezanda n'abawenyan'omukonon'atakaokwenyonyolaeriabantu. \v 34NayebwebaamutegeirengaMuyudaaya,bonabonanebatumulirawaigulun'eidoboozilimu okumalang'essaawaibirintiAtemiw'Abaefesomukulu.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 33 Ne batoola Alegezanda mu kibiina, Abayudaaya nga bamusindiikirirya. Alegezanda n'abawenya n'omukono n'ataka okwenyonyola eri abantu. \v 34 Naye bwe baamutegeire nga Muyudaaya, bonabona ne batumulira waigulu n'eidoboozi limu okumala ng'essaawa ibiri nti Atemi w'Abaefeso mukulu.
\ No newline at end of file
diff --git a/19/35.txt b/19/35.txt
index cde68f3..7d623f1 100644
--- a/19/35.txt
+++ b/19/35.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 35 Omuwandiiki bwe yasirikirye ekibiina, n'akoba nti Abasaiza Abaefeso, muntu ki atategeera ng'ekibuga ky'Abaefeso niikyo kikuuma eisabo lya Atemi omukulu n'ekifaananyi ekyava eri Zewu. \v 36 Kale kubanga ebyo tebyegaanika, kibagwaniire imwe okwikaikana n'obutakola kintu mu kwanguyirirya. \v 37 Kubanga muleetere abantu bano abatanyagire by'omu isabo so era tebavoire katonda waisu omukali.
-=======
-\v 35Omuwandiikibweyasirikiryeekibiina,n'akobantiAbasaizaAbaefeso,muntukiatategeera ng'ekibugaky'AbaefesoniikyokikuumaeisabolyaAtemiomukulun'ekifaananyiekyavaeriZewu. \v 36Kalekubangaebyotebyegaanika,kibagwaniireimweokwikaikanan'obutakolakintumu kwanguyirirya. \v 37Kubangamuleetereabantubanoabatanyagireby'omuisabosoeratebavoirekatondawaisu omukali.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 35 Omuwandiiki bwe yasirikirye ekibiina, n'akoba nti Abasaiza Abaefeso, muntu ki atategeera ng'ekibuga ky'Abaefeso niikyo kikuuma eisabo lya Atemi omukulu n'ekifaananyi ekyava eri Zewu. \v 36 Kale kubanga ebyo tebyegaanika, kibagwaniire imwe okwikaikana n'obutakola kintu mu kwanguyirirya. \v 37 Kubanga muleetere abantu bano abatanyagire by'omu isabo so era tebavoire katonda waisu omukali.
\ No newline at end of file
diff --git a/19/38.txt b/19/38.txt
index af23405..d68d2d5 100644
--- a/19/38.txt
+++ b/19/38.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 38 Kale oba nga Demeteriyo n'abaweesi abali naye balina ekigambo ku muntu, enkiiko giriwo n'abaamasaza baliwo: baloopagane. \v 39 Naye oba nga musagira bindi, byasalirwa mu ikuŋaaniro eribbaawo buliijo. \v 40 Kubanga dala tusobola okutuukwaku akabbiibi olw'akeegugungu kano aka atyanu, kubanga wabula nsonga gye tusobola okuwozia olw'okukuŋaana kuno. \v 41 Bwe yatumire atyo n'ayabulula ekibiina.
-=======
-\v 38KaleobangaDemeteriyon'abaweesiabalinayebalinaekigambokumuntu,enkiikogiriwo n'abaamasazabaliwo:baloopagane. \v 39Nayeobangamusagirabindi,byasalirwamuikuŋaaniroeribbaawobuliijo. \v 40Kubangadalatusobolaokutuukwakuakabbiibiolw'akeegugungukanoakaatyanu,kubanga wabulansongagyetusobolaokuwoziaolw'okukuŋaanakuno. \v 41Bweyatumireatyon'ayabululaekibiina.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 38 Kale oba nga Demeteriyo n'abaweesi abali naye balina ekigambo ku muntu, enkiiko giriwo n'abaamasaza baliwo: baloopagane. \v 39 Naye oba nga musagira bindi, byasalirwa mu ikuŋaaniro eribbaawo buliijo. \v 40 Kubanga dala tusobola okutuukwaku akabbiibi olw'akeegugungu kano aka atyanu, kubanga wabula nsonga gye tusobola okuwozia olw'okukuÅ‹aana kuno. Bwe yatumire atyo n'ayabulula ekibiina.
\ No newline at end of file
diff --git a/20/01.txt b/20/01.txt
index f6413b3..d6493b2 100644
--- a/20/01.txt
+++ b/20/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Akacwanu bwe kamalire okwikaikana, Pawulo n'abita abayigirizwa n'ababuulirira n'abasiibula, n'avaayo okwaba e Makedoni. \v 2 Bwe yabitire mu njuyi gidi n'abategeeza ebigambo bingi, n'atuuka e Buyonaani. \v 3 Bwe yamalire emyezi eisatu, era Abayudaaya bwe baamusaliire olukwe, bwe yabbaire ng'ayaba okubita mu nyanza okwirayo mu Makedoni.
-=======
-\v 1Akacwanubwekamalireokwikaikana,Pawulon'abitaabayigirizwan'ababuuliriran'abasiibula, n'avaayookwabaeMakedoni. \v 2Bweyabitiremunjuyigidin'abategeezaebigambobingi,n'atuukaeBuyonaani. \v 3Bweyamalireemyezieisatu,eraAbayudaayabwebaamusaliireolukwe,bweyabbaire ng'ayabaokubitamunyanzaokwirayomuMakedoni.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\c 20 \v 1 Akacwanu bwe kamalire okwikaikana, Pawulo n'abita abayigirizwa n'ababuulirira n'abasiibula, n'avaayo okwaba e Makedoni. \v 2 Bwe yabitire mu njuyi gidi n'abategeeza ebigambo bingi, n'atuuka e Buyonaani. \v 3 Bwe yamalire emyezi eisatu, era Abayudaaya bwe baamusaliire olukwe, bwe yabbaire ng'ayaba okubita mu nyanza okwirayo mu Makedoni.
\ No newline at end of file
diff --git a/20/04.txt b/20/04.txt
index 10c9c39..7f275b2 100644
--- a/20/04.txt
+++ b/20/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Ne baaba naye okutuuka mu Asiya Sopateri Omuberoya mutaane wa Puulo; n'Abasesaloniika Alisutaluuko no Sekundo; no Gayo Omuderube no Timoseewo; n'AbasiyaTukiko no Tulofiimo. \v 5 Bano ne batangira ne batulindirira mu Tulowa. \v 6 Ife ne tuva mu Firipi ne tuwanika amatanga oluvanyuma lw'enaku egy'emigaati egitazimbulukuswa, ne tubatuukaku mu Tulowa mu naku itaanu; gye twamalire enaku omusanvu.
-=======
-\v 4NebaabanayeokutuukamuAsiyaSopateriOmuberoyamutaanewaPuulo;n'Abasesaloniika AlisutaluukonoSekundo;noGayoOmuderubenoTimoseewo;n'AbasiyaTukikonoTulofiimo. \v 5BanonebatangiranebatulindiriramuTulowa. \v 6IfenetuvamuFiripinetuwanikaamatangaoluvanyumalw'enakuegy'emigaati egitazimbulukuswa,netubatuukakumuTulowamunakuitaanu;gyetwamalireenaku omusanvu.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 4 Ne baaba naye okutuuka mu Asiya Sopateri Omuberoya mutaane wa Puulo; n'Abasesaloniika Alisutaluuko no Sekundo; no Gayo Omuderube no Timoseewo; n'AbasiyaTukiko no Tulofiimo. \v 5 Bano ne batangira ne batulindirira mu Tulowa. \v 6 Ife ne tuva mu Firipi ne tuwanika amatanga oluvanyuma lw'enaku egy'emigaati egitazimbulukuswa, ne tubatuukaku mu Tulowa mu naku itaanu; gye twamalire enaku omusanvu.
\ No newline at end of file
diff --git a/20/07.txt b/20/07.txt
index a187052..9bae1b9 100644
--- a/20/07.txt
+++ b/20/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 Awo ku lunaku olw'oluberyeberye mu sabbiiti, bwe twakuŋaanire okumenya emigaati, Pawulo n'aloogya nabo, ng'ataka okusitula amakeeri, n'alwawo mu kutumula okutuusia eitumbi. \v 8 Ne wabbaawo etabaaza nyingi mu kisenge ekya waigulu, mwe twakuŋaaniire.
-=======
-\v 7 Awokulunakuolw'oluberyeberyemusabbiiti,bwetwakuŋaanireokumenyaemigaati,Pawulo n'aloogyanabo,ng'atakaokusitulaamakeeri,n'alwawomukutumulaokutuusiaeitumbi. \v 8 Newabbaawoetabaazanyingimukisengeekyawaigulu,mwetwakuŋaaniire.
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+\v 7 Awo ku lunaku olw'oluberyeberye mu sabbiiti, bwe twakuŋaanire okumenya emigaati, Pawulo n'aloogya nabo, ng'ataka okusitula amakeeri, n'alwawo mu kutumula okutuusia eitumbi. \v 8 Ne wabbaawo etabaaza nyingi mu kisenge ekya waigulu, mwe twakuŋaaniire.
\ No newline at end of file
diff --git a/20/title.txt b/20/title.txt
index 5b72a77..f721c3d 100644
--- a/20/title.txt
+++ b/20/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Ensuula 28
-=======
-Esuula 20
->>>>>>> 46e892dad2a4c7c55e2542ef74fb8fbd9fd08aae
+Esuula 20
\ No newline at end of file