diff --git a/03/11.txt b/03/11.txt
index d3d625a..a6f598f 100644
--- a/03/11.txt
+++ b/03/11.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 11 Zvino Mwari wedu naBaba emene naMambo
-wedu Jesu ngaatungamirire njira yedu kwomuri. \v 12 NaMambo ngaaite kuti muwande nokuwanza rudo pakati penyu umwe kune umweni nokunevanhu veshe, kudai ngezvetinoitawo isusu kwomuri. \v 13 kuti ena agwinyise mwoyo yenyu mukucheneswa kuti muite vasina ndaa pamberi paMwari wedu naBaba, pakuuya kwaMambo wedu Jesu pamwepo nevatswene vake veshe.
-=======
-\v 11 Asi Mwari, Baba wedu, Mambo wedu Jesu, nasiriranhi guanja redu mbesa renhu. \v 12 Kuti Mambo ngamukuje meipidirija rudo umwe kunoumweni, kwamuri mwese, kutojana kwedu naimwimwi; pakati pokuvanguisa moyo yenhu. \v 13 Kuti mushapumbwa pautsene pakati pamwari wenhu Baba,pakuviya Mambo Jesu nohutsene wese.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 11 Zvino Mwari wedu naBaba emene naMambo wedu Jesu ngaatungamirire njira yedu kwomuri. \v 12 NaMambo ngaaite kuti muwande nokuwanza rudo pakati penyu umwe kune umweni nokunevanhu veshe, kudai ngezvetinoitawo isusu kwomuri. \v 13 kuti ena agwinyise mwoyo yenyu mukucheneswa kuti muite vasina ndaa pamberi paMwari wedu naBaba, pakuuya kwaMambo wedu Jesu pamwepo nevatswene vake veshe.
\ No newline at end of file
diff --git a/04/01.txt b/04/01.txt
index 0031a63..7a1c0fd 100644
--- a/04/01.txt
+++ b/04/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 4 \v 1 Ndizvo pakupedzisira, hama, tinomukumbira nokukumbira munaMambo Jesu kuti, kudai ngezvemwakaashira kwetiri njira inofanera yekuhamba ndiyo nekumudakadza Mwari, kudai ngezvomunohamba, kuti muwanze kudaro. \v 2 Ngokuti munozia kupanga kwetakamupanga kubudikidza ndiMambo Jesu.
-=======
-\c 4 \v 1 Ngokudaro,hama,ngozvasara kumushonipa nokumukuja paMambo Jesu, ngokuti takaashira Kwamuri kuti tifambe mukudakajisa Mwari ngokuti tirikufamba, ngatidaro nguva jese. \v 2 Asi Munoziva mupango jamakapuwa na Mambo Jesu.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\c 4 \v 1 Ndizvo pakupedzisira, hama, tinomukumbira nokukumbira munaMambo Jesu kuti, kudai ngezvemwakaashira kwetiri njira inofanera yekuhamba ndiyo nekumudakadza Mwari, kudai ngezvomunohamba, kuti muwanze kudaro. \v 2 Ngekuti munozia kupanga kwetakamupanga kubudikidza ndiMambo Jesu.
\ No newline at end of file
diff --git a/04/03.txt b/04/03.txt
index b4f9c6e..fff44e3 100644
--- a/04/03.txt
+++ b/04/03.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
 \v 3 Ngokuti uku ndikwo kuda kwaMwari, kucheneswa kwenyu; kuti murekere kupomba, \v 4 kuti umwe ngaumwe wenyu azie njira yokudzitorera mukadzi pachake  mukucheneswa
-nemukureremedza, \v 5 haiwa ngokuemura kwakashata, kudai ngevemadzinza vasikamuzii Mwari. \v 6 kuti kusaapo naumwe unopauka nokushaishira hama yake ngeiyi ndaa, ngokuti Mambo ndiye muunzidziri weizvi zveshe, kudai ngezvetakambomuronzera nokupupura kudaro.
-=======
-\v 3 Asi uku kuda kwamwari; utsene wenhu, kuti mushaite shitema choumaponde, kuti \v 4 Umwe naumwe azive kugara no mujiyo wake oustzene nokureremeja. \v 5 kushiripi ngokuda kakashata, tenga vahedeni vashikazivi Mwari. \v 6 Ngokudaro Apana anoctjengeja nokuzvinhirira hama yako, ngokuti  Mambo indiena anotambuja. pazvese ngokuti tichito takananga topekeja chapupu.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+nemukureremedza, \v 5 haiwa ngokuemura kwakashata, kudai ngevemadzinza vasikamuzii Mwari. \v 6 kuti kusaapo naumwe unopauka nokushaishira hama yake ngeiyi ndaa, ngokuti Mambo ndiye muunzidziri weizvi zveshe, kudai ngezvetakambomuronzera nokupupura kudaro.
\ No newline at end of file
diff --git a/04/07.txt b/04/07.txt
index 21ce628..99bcbf6 100644
--- a/04/07.txt
+++ b/04/07.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 7 Ngokuti Mwari aazi kutidaidzira kunezvisikazi kusukika, asi mune zvakacheneswa. \v 8 Ndizvo
-kunyazwi ndiani unoramba izvi, aarambi munhu akadi, asi unoramba Mwari, uwo unopa
-kwomuri Mweya wake Wakachena.
-=======
-\v 7 Asi Mwari azivi kutidanja kukushata, Asi wakatidainja kuhuzvene. \v 8 Ngokudaro anoramba achiripi mundhu, Asi kwaMwari, ngokuti wakamupavo Mweya mutsene.
->>>>>>> 498490e50a9ffce5464afc9b4dccdfcae329224a
+\v 7 Ngokuti Mwari aazi kutidaidzira kunezvisikazi kusukika, asi mune zvakacheneswa. \v 8 Ndizvo kunyazwi ndiani unoramba izvi, aarambi munhu akadi, asi unoramba Mwari, uwo unopa kwomuri Mweya wake .
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 9c0b344..5e4cce4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -62,7 +62,10 @@
 		"03-04",
 		"03-06",
 		"03-08",
+		"03-11",
 		"04-title",
+		"04-01",
+		"04-03",
 		"05-title"
 	]
 }
\ No newline at end of file