diff --git a/04/18.txt b/04/18.txt
index d0364da..6b0a682 100644
--- a/04/18.txt
+++ b/04/18.txt
@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-\v 18 In she ho nyerak yen sussuk, kuma fiye ni hum ma. Nsok ka Lankan nshogho ma she inshye nwok Epaphroditus a nyinyen noshe ghi nhya ghan. aye tar kamshi, sadaka she Bawai shye gna.
-\v 19 Bawai mi ghi chwan chin a bukatu ghin bisa gha damim gna in ghe Kristo Jesu.
-\v 20 Kabini ngheg bawai ni mba mat asok yhokhak na din din din ni din din din, ashohum.
-=======
 \v 18 Nshe ho nyarak nyan had ni wai. Nsok barki kabini ma she nshe nghe ghe Epaphroditus a nyinyen she ghi hazak me nin gan. Aye nyen kanshi, sadaka she Bawai Sheri nghe.
 \v 19 Bawai mi ghi chwan din a bukatu ghin bisa ga damim nha yhokhak nha n  Kristo Jesu.
 \v 20 Kabini ngheg bawai ni mba ma he . t asok yhokhak na din din din ni din din din, ashohum.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
diff --git a/04/21.txt b/04/21.txt
index 265ac9d..82ee38a 100644
--- a/04/21.txt
+++ b/04/21.txt
@@ -1,8 +1,3 @@
 \v 21 Sarini sussuk affifatsak asyai nyhie kristo jesu. Ananak nahye ajen ni mmi aghi sari ghin.
 \v 22 Sussuk affifatsak asyai nahye ajen manu aghi sarighin, titiba nohye arhu ghirha cacsar.
-<<<<<<< HEAD
-
-\v 23 Barkhi Jesu Kristo asho nha Rhum bin.
-=======
 \v 23 Barki mbangiji Jesu Kristo asho na rhum bin.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
diff --git a/manifest.json b/manifest.json
index d84f26e..be51da1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"php","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-28","01-25","01-22","01-20","01-18","01-15","01-12","01-07","01-01","front-title","01-title","02-title","02-01","02-03","03-title","04-title","04-21","04-18","03-20","03-17","03-15","03-12","03-06","03-04","03-01","02-22","02-19","02-17","02-14","02-12","02-09","02-05"]}
\ No newline at end of file
+{"project":{"id":"php","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":3},"package_version":7,"target_language":{"name":"Atsam","direction":"ltr","anglicized_name":"Atsam","region":"Africa","is_gateway_language":false,"id":"cch"},"format":"usfm","resource":{"id":"reg"},"translators":["Atsam"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"}],"finished_chunks":["01-28","01-25","01-22","01-20","01-18","01-15","01-12","01-07","01-01","front-title","01-title","02-title","02-01","02-03","03-title","04-title","03-20","03-17","03-15","03-12","03-06","03-04","03-01","02-22","02-19","02-17","02-14","02-12","02-09","02-05","04-21"]}
\ No newline at end of file