diff --git a/02/19.txt b/02/19.txt
index 3080f07..855dcb9 100644
--- a/02/19.txt
+++ b/02/19.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 19 Nazaq iyan muran ne God ago maror asan ban iyim mataw begbegta og saw haresmo luw yaqayta nazaq ne a ta hi luway. Haiqgam. Ne God ago on mataw tawonta na bunmo nenaq araqibmo God ago maror aduganib tugwahtiqim ne in asenlulibmo diq tiqiyim osayta. \v 20 Ne bilaqne God aholyon bit amta nazaq nog. Sa God Aposel teq in ago nantut nagan in bilaq ne tituq gan nog iysa God in gimalib ago bit na wazan tiqeraqaq. Sa Kraiks Yesus in bit na ago tituq liqab diq ta iyim in bit na anon bunmno tisoraq. \v 21 Sorsa  bit na aditin bunmo Krais aholib soqitim ussa Ayahta Krais-mo in bit na ulum tutsa in ayah iyad God ago bit tawonta nog tiqiyaq. \v 22 Sa ne inaqmo krais Yesus ago hib soqotan in ne giwaqim Juda on mataw na nenaq girom tonan ne bunmo God ago bit in ago Bugaw Dimunta bo osaqta na tiqiyiy.
-=======
-\v 19 Nazaq iyan muran ne God ago maror asan ban iyim mataw begbegta og saw haresmo luw yaqayta nazaq ne a ta hi luway.Haiqgam. Ne God ago on mataw tawonta na bunmo nenaq araqibmo God ago maror aduganib tugwahtiqim ne in asenlulmo diq tiqiyim osayta. \v 20 Ne bilaqne God aholyon bit amta nazaq nog. Sa God ago Aposel teq in ago nantut nagan in bilaqne tituq gan nog iysa God in gimalib ago bit na wazan tiqeraqaq. Sa Krais Yesus in bit na ago tituq liqab diqta iyim in bit na anon bunmo tisoraq. \v 21 Sorsa bit na aditin bunmo Krais-mo in bit na ulum tutsa in ayah iyad God ago bit tawonta nog tiqiyaq. \v 22 Sa ne inaqmo Krais Yesus ago hib soqotan in ne giwaqim Juda on mataw na nenaq girom tonan ne bunmo God ago bit in ago Bugaw Dimunta bo osaqta na tiqiyiy.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-gabagsal_eph_text_reg.git
diff --git a/manifest.json b/manifest.json
index 440485f..0c814cc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"eph","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["gabagsal","PJenkins"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","03-01","03-03","05-03","03-06","03-08","03-12","03-17","04-09","05-01","04-11","03-20","04-23","02-19","03-10","03-14","04-01","04-04","04-07","04-14","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","03-title","04-title","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17"]}
\ No newline at end of file
+{"project":{"id":"eph","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Gabagsal","direction":"ltr","anglicized_name":"","region":"Papua New Guinea ","is_gateway_language":false,"id":"mlp-x-gabagsal"},"format":"usfm","resource":{"id":"reg"},"translators":["gabagsal","PJenkins"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20220324,"version":"21-05"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"}],"finished_chunks":["01-title","06-04","06-05","06-01","06-14","06-12","06-10","06-09","05-13","03-01","03-03","05-03","03-06","03-08","03-12","03-17","04-09","05-01","04-11","03-20","04-23","03-10","03-14","04-01","04-04","04-07","04-14","04-17","04-20","04-25","04-28","06-19","06-21","06-23","06-17","05-05","05-08","05-15","04-31","05-18","05-22","05-25","05-28","05-31","03-title","04-title","05-title","06-title","01-01","01-03","01-05","01-07","01-09","01-11","01-13","01-15","01-17","01-19","01-22","02-title","02-01","02-04","02-08","02-11","02-13","02-17","02-19"]}
\ No newline at end of file