diff --git a/04/14.txt b/04/14.txt
index e6d3a1d..3ae7327 100644
--- a/04/14.txt
+++ b/04/14.txt
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
-\v 14 Nihum, ghi zhi yhorhek she ghi fya wok nin mi ngye shu wahala.
-\v 15 Ghin a Filibiyawa ghi gi ye in tutumi titi bin, makhi noshe ndak Makidoniya, ba Ekklesiya noshe a barkhi me in bangare nizim ni shyezim sai ka ghin.
-\v 16 Har ma in makhi noshe in zi ghin Tassalonika, ghi han mi ni barkhi fiye ni ndong.
-\v 17 Ba waiye in gyari barkhi ba. Mma, in gyari a mankun noshe aghi wai ghin ryi kunyan.
-=======
 \v 14 Nihum, ghi zhi yhorhek she ghi barki mi nghe shu wuya mi. 
 \v 15 Ghin a Filibiyawa ghi ni ryamzi ye ntumi titibin, makhi she ndag Makidonia, ba Pok titibin she a barki me npanni nizim ni shezim sai ka ghin. 
 \v 16 Makhi she nzi ghi Tasalonika.ghi hammi ni barki ba ka kadong ba.
 \v 17 Ba wai ye ngyari barki ba. Mma, a mankun she aghi shogan riba ghin.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Atsam/cch_php_text_reg.git
diff --git a/manifest.json b/manifest.json
index 0629cf4..d84f26e 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","04-14","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","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