diff --git a/02/17.txt b/02/17.txt
index 08494e7..32bad12 100644
--- a/02/17.txt
+++ b/02/17.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 17 Asi kudai tisu, hama, petakaparadzaniswa nemwi kwenguva doko, mukuonana kwemuiri, haiwa kwomwoyo, takatsamwirira kuona hope yenyu ngokumushuwira kakurutu. \v 18 Ngokuti tinoda kuuya kwomuri. Inini, Phauri, kamwe nokwechipiri, naSathani wakatipinga. \v 19 Ngokuti chiinyi gonda redu nokuti kudakara kwedu nokuti dzungudza retinoganza ndiro pamberi paMambo wedu Jesu pakuuya kwake? Andimwipi here? \v 20 Ngekuti imwimwi muri uthende wedu nekudakara kwedu.
-=======
-\v 19 \v 17 Asi itisu hama, petakaparadzwa nemwi ngeguva choma, mokuonana kwomuiri , asi kwemoyo , takagaririra kuona hope yenyu ngokumushingirira kwakakura. \v 18 Nokuti taida kuviya kwomuri, inini, Phauro, kamwe nekwechipiri, nasathani wakatipinga.  \v Nokuti  Manbo Jesu angazo wirira ngerapi gondisho redu kana kudakara kwedu nokuti dzungudza retinogadjwa ndiro?  pamberi paMambo wedu Jesu pkuuya kwake andimwipi here. \v 20 Ngokuti imwimwi muno kuganha hwedu nokudara kwedu
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 17 Asi kudai tisu, hama, petakaparadzaniswa nemwi kwenguva doko, mukuonana kwemuiri, haiwa kwomwoyo, takatsamwirira kuona hope yenyu ngokumushuwira kakurutu. \v 18 Ngekuti tinoda kuuya kwomuri. Inini, Phauri, kamwe nokwechipiri, naSathani wakatipinga. \v 19 Ngokuti chiinyi gonda redu nekuti kudakara kwedu nokuti dzungudza retinoganza ndiro pamberi paMambo wedu Jesu pakuuya kwake? Andimwipi here? \v 20 Ngekuti imwimwi muri uthende wedu nekudakara kwedu.
\ No newline at end of file
diff --git a/03/01.txt b/03/01.txt
index 070f2ef..fd13103 100644
--- a/03/01.txt
+++ b/03/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 3 \v 1 Ndizvo apo takakorera kushingirira, takapinimidza kuti kwakanaka kuti tisiiwe sure tega muAtenesi. \v 2 Nesu takatuma Thimothi, hama yedu nomushandi waMwari muvhangeri raKristu, kuti amugwinyise nokumuembedzera mukutenda kwenyu. \v 3 Kuti asazoapo munhu unokutukuswa ngemadambudziko aya. Ngegwinyiso imwimwi mwemene munozia kuti izvi ndizvo zvetakaemeserwa.
-=======
-\c 3 \v 1 Ngokudaro,atishaidepi kukwanisazve, takazogara tega kuhAtena. \v 2 Takazotuma hama yedu Timoti hama yedu arimushandi wakristo muvhangeri raKristo kuti amuguinhise nokuvanguisa muvhangeri raKristo pagonda renhu. \v 3 Pakuti apana anowaniwa ngommatambujiko ondhoo.  Ngokuti tahemesewa zvondhozho.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\c 3 \v 1 Ndizvo apo takakorera kushingirira, takapinimidza kuti kwakanaka kuti tisiiwe sure tega muAtenesi. \v 2 Nesu takatuma Thimothi, hama yedu nomushandi waMwari muvhangeri raKristu, kuti amugwinyise nokumuembedzera mukutenda kwenyu. \v 3 Kuti asazoapo munhu unokutukuswa ngemadambudziko aya. Ngegwinyiso imwimwi mwemene munozia kuti izvi ndizvo zvetakaemeserwa.
\ No newline at end of file
diff --git a/03/04.txt b/03/04.txt
index aac5a10..7c14daa 100644
--- a/03/04.txt
+++ b/03/04.txt
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-\v 4 Ngegwinyiso, apo petaInga nemwi, takambomuronzera kuti tinozorwadziwa
-ngokutambudzwa, kudai ngezvakaitika, kudai ngezvomunozia. \v 5 Ngeiyi ndaa ininiwo apo
-ndakakorera kushingirira, ndakatumira kuti ndizie ngendaa yokutenda kwenyu, ndechitya kuti
-pamweni muedzi waiya amuedza nomushando wedu waizoita usina shkwiro.
-=======
-\v 4 Ngomuchokwadi, Patainga Naimwimwi maitivhunja kuti tishito kuti tinozotanbudjika  kutamujua zvakamboitikayazve,noku ti munozviziva. \v 5 Ngokwazvo, pandajayida kukwanisha, Inini  ndakamutuma kuti ndione gonda renhu inini ndaityia kuti mueji amueje, kuti basa redu rishande.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 4 Ngegwinyiso, apo petaInga nemwi, takambomuronzera kuti tinozorwadziwa ngokutambudzwa, kudai ngezvakaitika, kudai ngezvomunozia. \v 5 Ngeiyi ndaa ininiwo apo ndakakorera kushingirira, ndakatumira kuti ndizie ngendaa yokutenda kwenyu, ndechitya kuti
+pamweni muedzi waiya amuedza nomushando wedu waizoita usina shkwiro.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a6256c1..6f43a4b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -55,7 +55,10 @@
 		"02-07",
 		"02-10",
 		"02-13",
+		"02-14",
+		"02-17",
 		"03-title",
+		"03-01",
 		"04-title",
 		"05-title"
 	]