diff --git a/02/13.txt b/02/13.txt
index 2b05e01..c11ed32 100644
--- a/02/13.txt
+++ b/02/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Isusuwo tinoangira kubonga Mwari ngeizvi, kuti apo pemwakaashira izwi raMwari iro remwakazwa kubva kwetiri, mwakariashira haiwa kudai ngeizwi revanhu, asi kudai ngezveriri gwinyiso, izwi raMwari, iro rinoshandawo mukati mwenyu imwimwi vatendi.
-=======
-\v 13 Ngokuda itusu tinotenda Mwari paiya, panoachira itusu mazwi awazwa, uchaatenda nenga mazwi omundhu , ngondava yokuti iona, mazwi a Mwari. aya ndiona mazwi anoitisa kuti utende.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 13 Isusuwo tinoangira kubonga Mwari ngeizvi, kuti apo pemwakaashira izwi raMwari iro remwakazwa kubva kwetiri, mwakariashira haiwa kudai ngeizwi revanhu, asi kudai ngezveriri gwinyiso, izwi raMwari, iro rinoshandawo mukati mwenyu imwimwi vatendi.
\ No newline at end of file
diff --git a/02/14.txt b/02/14.txt
index aeb5f64..69a251c 100644
--- a/02/14.txt
+++ b/02/14.txt
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-\v 14 Ngokuti imwimwi, hama, mwakaita vatedzereri vezviara zvaMwari munaKristu Jesu izvo zviri muJudhiya, ngokuti mwakatambudzwawo ngezviro zvakatodzana ngevanhu venyika yenyu
-kudai ngezvevakatambudzwa avo ngevaJudha. 15 \v 15 avo vaJudha vakauraya veshe. Mambo Jesu nevaprofeti, vakatidzinga, vasikadakadzi Mwari, vari vanorwisana nevanhu veshe, \v 16 vechitirambidza
-kureketa kunevemadzinza kuti vaponeswe. Ndizvo vakaangira vechizadzisa chipimo chekushaisha kwavo ngenguva dzeshe. Asi ushungu waMwari wakauya padera pavo.
-pakupedzisira.
-=======
-\v 14 Nokuti imwimwi, hama, mwakaita vatevereri vemuchiara raMwari Kristu Jesu; zviri muJudheya, nokuti mwakatambudjwua nozviro zvakatodjana ngevanhu venyika yenyu kudai ngezvevakatambudjwa avo ngevajudhea. \v 15 Avo vakaenda vaJudeu vakamuraya veshe Manbo Jesu nevaProfeti. Vakati gogomera, vachingadakadzirMwari, vanorwisana noveshe vanarume; \v 16 Vechitiranbisa kuvereketa kunavemadjindza kuti vaponeswe, ndizvo vechizadzisa chipimo chochishaishi kwavo ngenguva weshe asi ushungu hwaMwari hwakauya panber pavo pakupedjesera.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 14 Ngokuti imwimwi, hama, mwakaita vatedzereri vezviara zvaMwari munaKristu Jesu izvo zviri muJudhiya, ngokuti mwakatambudzwawo ngezviro zvakatodzana ngevanhu venyika yenyu kudai ngezvevakatambudzwa avo ngevaJudha. \v 15 avo vaJudha vakauraya veshe. Mambo Jesu nevaprofeti, vakatidzinga, vasikadakadzi Mwari, vari vanorwisana nevanhu veshe, \v 16 vechitirambidza kureketa kunevemadzinza kuti vaponeswe. Ndizvo vakaangira vechizadzisa chipimo chekushaisha kwavo ngenguva dzeshe. Asi ushungu waMwari wakauya padera pavo.
+pakupedzisira.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index ddf27fb..a6256c1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -54,6 +54,7 @@
 		"02-05",
 		"02-07",
 		"02-10",
+		"02-13",
 		"03-title",
 		"04-title",
 		"05-title"