diff --git a/18/01.txt b/18/01.txt
index 2d790b4..40f3b02 100644
--- a/18/01.txt
+++ b/18/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 18 \v 1 Nokwakamana zhyintu eezyi Paul wakazhwa ku Athens akuunka ku Corinth. \v 2 Kulya wakaswaanganya mu Jew wazhyina lya Aquila, himinzhyi wa Pontus, wakazhyila ku Italy a mwinakwe Priscilla, nkaambo Claudius wakalailila boonse bama Jews kuti bazhwe mu Looma. Paul wakaya kuli mbabo, \v 3 alimwi nkaambo wakabeleka mpindu iikonzhyene, wakakkala ambabo alimwi akubeleka, mbobakali bahikubamba matente mu mpindu.
-=======
-\c 18 \v 1 Nokwakamana zhyintu ezhyi Paul wakazhwa ku Athens wakaya ku Corinth. \v 2 Kulya wakaswaanganya muntu wahyina lya Aquilla, himinhyi wa Pontus, wazhyila ku Italy a mwinakwe Priscilla, nkaambo Claudius waka lailila boonse ba Juda kuti bahwe mu Rome. Paul wakaya kuli mbabo, \v 3 alimwi nkaambo wakabeleka mpindu iikozhyene, wakala ambobo alimwi wakabeleka, nkaambo bakali bahikubamba tukutu mu mulimo.
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\c 18 \v 1 \v 2 \v 3 Conflict Parsing Error
\ No newline at end of file
diff --git a/18/04.txt b/18/04.txt
index 0cfd897..f788457 100644
--- a/18/04.txt
+++ b/18/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Aboobo Paul wakali kukambauka  mu synagogue nsabata a nsabata, kusola kukombelezhya boonse bama Jews abama  Greeks. \v 5 Ono Silas a Timothy nobakaboola kuzhwa ku Macedonia, Paul wakalipa lwakwe kuzwi, kalungulula kuma Jews kuti Jeso wakali Klisto. \v 6 Pele bama Jews nobakakazhya alimwi akumutukana, Paul wakabasowela zhyisani zhyakwe alimwi wakaamba kuli mbabo, "Bulowa bwenu bube amitwe yenu; mebo ndasalala. Kuzhwa ono ndilaunka kuli bama Gentiles."
-=======
-\v 4 \v 5 \v 6 koAboobo Paul wakayeya mu synagogue mu nsabata a nsabata, kusola kubakombelezya boonse ba Juda aba Giliki. Ono Silas a Timothy nobaboola kuz hwa ku Macedonia, Paul wakalipa lwake ku Zwi, kakanana kuma Juda kuti Jeso wakali Klisto. Pele ba Juda noba kakazya alimwi aku tukana
->>>>>>> de5d12a5ab642c03cf703869609ad57f8522e2c9
+\v 4 \v 5 \v 6 Conflict Parsing Error
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 97e296f..70d34bc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -35,7 +35,8 @@
 	"translators": [
 		"siachinenem",
 		"mwaka",
-		"Davies, Thomas, Mason, Nachowa, Decent, Debnat, Josphat, Nkolola, Hachote, Ackson, Medley, Enfredah"
+		"Davies, Thomas, Mason, Nachowa, Decent, Debnat, Josphat, Nkolola, Hachote, Ackson, Medley, Enfredah",
+		"Timothy Muzgatama"
 	],
 	"finished_chunks": [
 		"02-title",