diff --git a/08/11.txt b/08/11.txt
index c778bcb0..c123093d 100644
--- a/08/11.txt
+++ b/08/11.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 11Gigan kuri pis muan Farisi giba gikas in ginia hup hupyasrun wat Yisu. Kurinai ginia wat i yagab marahahiang basinta i ganungkun ini yakirib ayang. \v 12Yisu gikua gasap bumur wasak i ganun gan in ginia, ''Gisu aus in garamsagat i gubuak arunani kurinai gakantui gin i marahahiang? Zi ginia nizun wat agam, marahahiang mangan ma yakas i garamsagat i gubuak aruni gamuk.'' \v 13Gingan, rungan gingkiti kuampuak kuangian anai in gakatuab i gai pangkap, ingka rungan gihan mpui huak marahaiin.
-=======
-\v 11 Lehan teq Farisi asor Yesus agerab tuboliy. Bolim in Yesus ulum waqad buloniy, Ni God bulonid in daq araq azawayin inaqta em gwahtiqsa i ahol waqad teq i ni ninan helmo tihaqam haqiy.\v 12 Haqan Yesus in Farisi gimugan meqinta na tiloyinim in ahol afaqan tiqiy. Ahol afaqan iyad ahol aqrin ayahmo gwahtiqsa in bilam, Nagaqgo mataw muran  kam kabta ka in daq azawayin inaqta ahol waqnan bilaqay? ham. Ya hamo bilaqaiq ham. God daq araq azawayin  inaqta mataw muran kam kabta gimen a hi em negdaq ham. Haiqmo diq ham. Haqad Yesus ago disaipel  nenaq in mataw na gihulosad  muyib  ta gwalim  in yuw urotim aqurumun kozaq ban tilehiy.
->>>>>>> refs/heads/new
diff --git a/08/14.txt b/08/14.txt
index 811c5e37..720f534c 100644
--- a/08/14.txt
+++ b/08/14.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 14Kuri gan maran gisim ganang yakua yasangk i kurinai. Ganang basinta tak gimin gai pangkap wasak. \v 15Yisu gikab hup manangk wat kurinai gisuni, agam manangk wampai in wararab i rungam tak i yis Farisi gan ingka Herot.''
-=======
-\v 14 Lehad disaipel  gidek zizalan in bret kabemmo a hi waqiy.Bret amulikmo muyib osta naqmo in a lehiy.\v 15 Lehad luwimmo Yesus  era ago disaipaltigibilan, Ne Farisi teq Herot  inaq gigo  yis anan gihol waz naqmo hiqiyiy ham.
->>>>>>> refs/heads/new
diff --git a/08/16.txt b/08/16.txt
index ece2cab2..80af0a13 100644
--- a/08/16.txt
+++ b/08/16.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 16Kuri gan ginia hup wasak i rungan gisuni, ''Rungan ginia hup anai, i aus, agi ganang miayah.'' \v 17Yisu ru gararab sib hup aus kurinai nia gayang, ''I aus in agam ru ginia hup i ganang mami min ayang? Agam ma gikua wayant ma ma gararab amuk? Agam wayant gam ru gagu zu run?
-=======
-\v 16 Haqan disaipil in gimo an bulonim bilaqiy, I bret haiqgam iyan daqag in bilaqaqya haqiy. \v 17 Haqsa Yesus huritad teq in gibilan, Ne nagaqgo "i bret haiq" haqad osay? ham. Ne gime haiqta iyim ginad a hi em hasay ye? ham. Ne ginad gigem soqotim usaq e? ham.
->>>>>>> refs/heads/new
diff --git a/08/18.txt b/08/18.txt
index 1a3640c9..9fe69735 100644
--- a/08/18.txt
+++ b/08/18.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 18Agua maram gimin, in agua ma gararab amuk? Agam ringam gimin, in agua ma gayangua gamuk? Agua ma maram gihuar gamuk? \v 19I zi rumpu ganang hirukangkua hirukangkua basinta wasak i 5,000 garamsagat, agam gampuru ganang i kambih hurahua?'' In kurinai ginia wat, ''12 anai.''
-=======
-\v 18 Ne gime inaqta teq ne nagah ahol a hi waqayta ham. Ne gidek tizizal daqag ham. \v 19 Ya bret abaynaginmo orqayim mataw 5,000 negta na abeyan ne kuram ganim siheniy? him. Haqan disaipel bilaqiy, Na i kuram 12 nazaqmo gisihen haqiy.
->>>>>>> refs/heads/new
diff --git a/manifest.json b/manifest.json
index 0d5227db..b403739b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":18},"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Mari","region":"Pacific","is_gateway_language":false,"id":"hob"},"project":{"id":"mrk","name":"Mark"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"}],"translators":["Mari (Madang)","Wasabamal","amal","g"],"finished_chunks":["front-title","08-11","08-14","08-16","08-18","08-20","08-22","08-24","08-27","08-29","08-31","08-33","08-35","08-38","09-01","09-04","09-07","09-09","09-11","09-14","09-17","09-20","09-23","09-26","09-28","09-30","09-33","09-36","09-38","09-40","09-42","09-45","09-47","09-49","10-01","10-05","10-07","10-10","10-13","10-15","10-17","10-20","10-23","10-26","10-29","10-32","10-35","10-38","10-41","10-43","10-46","10-49","10-51","11-01","11-04","11-07","11-11","11-13","11-15","11-17","11-20","11-22","11-24","11-27","11-29","11-31","12-01","12-04","12-06","12-08","12-10","12-13","12-16","12-18","12-20","12-24","12-26","12-28","12-32","12-35","12-38","12-41","12-43","13-01","13-03","13-05","13-07","13-09","13-11","13-14","13-17","13-21","13-24","13-28","13-30","13-33","13-35","14-01","14-03","14-06","14-10","14-12","14-15","14-17","14-20","14-22","14-26","14-28","14-30","14-32","14-35","14-37","14-40","14-43","14-47","14-51","14-53","14-55","14-57","14-60","14-63","14-66","14-69","14-71","15-01","15-04","15-06","15-09","15-12","15-14","15-16","15-19","15-22","15-25","15-29","15-31","15-33","15-36","15-39","15-42","15-45","16-01","16-03","16-05","16-08","16-09","16-12","16-14","16-17","16-19","01-01","01-04","01-07","01-09","01-12","01-14","01-16","01-19","01-21","01-23","01-27","01-29","01-32","01-35","01-38","01-40","01-43","01-45","02-title","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-18","02-20","02-22","02-23","02-25","02-27","03-title","03-01","03-03","03-05","03-07","03-09","03-11","03-13","03-17","03-20","03-23","03-26","03-28","03-31","03-33","04-title","04-01","04-03","04-06","04-08","04-10","04-13","04-16","04-18","04-21","04-24","04-26","04-30","04-33","04-35","04-38","04-40","05-title","05-01","05-03","05-05","05-07","05-09","05-11","05-14","05-16","05-18","05-21","05-25","05-28","05-30","05-33","05-35","05-36","05-39","05-41","06-title","06-01","06-04","06-07","06-10","06-12","06-14","06-16","06-18","06-21","06-23","06-26","06-30","06-33","06-35","06-37","06-39","06-42","06-45","06-48","06-51","06-53","06-56","07-title","07-01","07-02","07-05","07-06","07-08","07-11","07-14","07-17","07-20","07-24","07-27","07-29","07-31","07-33","08-title","07-36","08-05","08-07"]}
\ No newline at end of file
+{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":18},"target_language":{"name":"Mari (Madang Province)","direction":"ltr","anglicized_name":"Mari","region":"Pacific","is_gateway_language":false,"id":"hob"},"project":{"id":"mrk","name":"Mark"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg"},"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":"2017-11-29T00:00:00+00:00","version":"12"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"as","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"}],"translators":["Mari (Madang)","Wasabamal","amal","g"],"finished_chunks":["front-title","08-20","08-22","08-24","08-27","08-29","08-31","08-33","08-35","08-38","09-01","09-04","09-07","09-09","09-11","09-14","09-17","09-20","09-23","09-26","09-28","09-30","09-33","09-36","09-38","09-40","09-42","09-45","09-47","09-49","10-01","10-05","10-07","10-10","10-13","10-15","10-17","10-20","10-23","10-26","10-29","10-32","10-35","10-38","10-41","10-43","10-46","10-49","10-51","11-01","11-04","11-07","11-11","11-13","11-15","11-17","11-20","11-22","11-24","11-27","11-29","11-31","12-01","12-04","12-06","12-08","12-10","12-13","12-16","12-18","12-20","12-24","12-26","12-28","12-32","12-35","12-38","12-41","12-43","13-01","13-03","13-05","13-07","13-09","13-11","13-14","13-17","13-21","13-24","13-28","13-30","13-33","13-35","14-01","14-03","14-06","14-10","14-12","14-15","14-17","14-20","14-22","14-26","14-28","14-30","14-32","14-35","14-37","14-40","14-43","14-47","14-51","14-53","14-55","14-57","14-60","14-63","14-66","14-69","14-71","15-01","15-04","15-06","15-09","15-12","15-14","15-16","15-19","15-22","15-25","15-29","15-31","15-33","15-36","15-39","15-42","15-45","16-01","16-03","16-05","16-08","16-09","16-12","16-14","16-17","16-19","01-01","01-04","01-07","01-09","01-12","01-14","01-16","01-19","01-21","01-23","01-27","01-29","01-32","01-35","01-38","01-40","01-43","01-45","02-title","02-01","02-03","02-05","02-08","02-10","02-13","02-15","02-17","02-18","02-20","02-22","02-23","02-25","02-27","03-title","03-01","03-03","03-05","03-07","03-09","03-11","03-13","03-17","03-20","03-23","03-26","03-28","03-31","03-33","04-title","04-01","04-03","04-06","04-08","04-10","04-13","04-16","04-18","04-21","04-24","04-26","04-30","04-33","04-35","04-38","04-40","05-title","05-01","05-03","05-05","05-07","05-09","05-11","05-14","05-16","05-18","05-21","05-25","05-28","05-30","05-33","05-35","05-36","05-39","05-41","06-title","06-01","06-04","06-07","06-10","06-12","06-14","06-16","06-18","06-21","06-23","06-26","06-30","06-33","06-35","06-37","06-39","06-42","06-45","06-48","06-51","06-53","06-56","07-title","07-01","07-02","07-05","07-06","07-08","07-11","07-14","07-17","07-20","07-24","07-27","07-29","07-31","07-33","08-title","07-36","08-05","08-07","08-18"]}
\ No newline at end of file