diff --git a/13/11.txt b/13/11.txt
index a0c3c9f..2f59f52 100644
--- a/13/11.txt
+++ b/13/11.txt
@@ -1 +1,5 @@
-\v 11 Alidji iyeni nama eeti ekotelaka a mbume,adjéi la ndjéka iwale nda enge e meme, adjaki owasi nda Dalagona.\v 12 Nama eho ekelakali okondji wo nama enge iliwoso ndi ango mine edjei nama eho, nama eho ekelakali  ate wato kpà wango wadji la mbume wa sambele nama enge eliwoso enge mpota ende elogo ekaliaka.
\ No newline at end of file
+<<<<<<< HEAD
+\v 11 Alidji iyeni nama eeti ekotelaka a mbume,adjéi la ndjéka iwale nda enge e meme, adjaki owasi nda Dalagona.\v 12 Nama eho ekelakali okondji wo nama enge iliwoso ndi ango mine edjei nama eho, nama eho ekelakali  ate wato kpà wango wadji la mbume wa sambele nama enge eliwoso enge mpota ende elogo ekaliaka.
+=======
+\v 11 Alidji iyeni nama eeti ekotelaka a mbume, adjei la ndjeka iwale nda enge e meme, adjaki owasi nda Dalagona. \v 12 Nama eho ekelakali okondji wo nama enge iliwoso ndi ango mine edjei nama eho, nama eho ekelakali ate wato kpaa wango wadji la mbume wa sambele nama nge eliwoso enge mpota ende elogo ekalalika.
+>>>>>>> refs/heads/new
diff --git a/manifest.json b/manifest.json
index ab8678f..1aa6984 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"rev","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Babango","direction":"ltr","anglicized_name":"Babango","region":"Africa","is_gateway_language":false,"id":"bbm"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin"],"source_translations":[{"language_id":"bn","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"}],"finished_chunks":["front-title","01-title","01-01","01-04","01-07","01-09","01-12","01-14","01-17","01-19","02-title","02-01","02-03","02-06","02-08","02-10","02-12","02-14","02-16","02-18","02-20","02-22","02-24","02-26","03-title","03-03","03-05","03-07","03-09","03-12","03-14","03-19","03-01","03-21","03-17","04-title","04-01","04-04","04-06","04-07","04-09","05-title","05-01","05-03","05-06","05-08","05-09","05-11","05-13","06-title","06-01","06-03","06-05","06-07","06-09","06-12","06-15","07-title","07-01","07-04","07-07","07-09","07-11","07-13","07-15","08-title","08-01","08-03","08-06","08-08","08-10","08-12","08-13","09-title","09-01","09-03","09-05","09-07","09-10","09-13","09-16","09-18","09-20","10-title","10-01","10-03","10-05","10-08","10-10","11-title","11-01","11-03","11-06","11-08","11-10","11-13","11-16","11-18","11-19","11-15","12-title","12-01","12-03","12-05","12-07","12-10","12-11","12-13","13-title","13-01","13-05","13-07","13-09","14-title","14-01","14-03","14-06","14-08","14-09","14-11","14-13","14-17","14-19","15-title","15-01","15-02","15-03","15-05","15-07","16-title","16-01","16-02","16-03","16-04","16-08","16-10","16-12","16-15","16-17","16-20","17-title","17-01","17-03","17-06","17-08","17-09","17-11","17-12","17-15","17-16","17-18","18-title","18-01","18-04","18-07","18-09","18-11","18-14","18-15","18-18","18-21","18-23","19-title","19-01","19-03","19-06","19-07","19-09","19-11","19-14","19-17","19-19","19-21","19-05","20-title","20-01","20-04","20-05","20-07","20-09","20-11","20-13","21-title","21-01","21-03","21-05","21-07","21-09","21-14","21-16","21-18","21-21","21-23","21-26","22-title","22-01","22-03","22-06","22-08","22-10","22-12","22-14","22-16","22-17","22-18","22-20","21-11","13-13","13-15","13-18","13-03","12-15","13-11","14-14"]}
\ No newline at end of file
+{"project":{"id":"rev","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Babango","direction":"ltr","anglicized_name":"Babango","region":"Africa","is_gateway_language":false,"id":"bbm"},"format":"usfm","resource":{"id":"reg"},"translators":["faustin"],"source_translations":[{"language_id":"bn","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":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"bn","resource_id":"ulb","checking_level":"3","date_modified":20161019,"version":"1"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"}],"finished_chunks":["front-title","01-title","01-01","01-04","01-07","01-09","01-12","01-14","01-17","01-19","02-title","02-01","02-03","02-06","02-08","02-10","02-12","02-14","02-16","02-18","02-20","02-22","02-24","02-26","03-title","03-03","03-05","03-07","03-09","03-12","03-14","03-19","03-01","03-21","03-17","04-title","04-01","04-04","04-06","04-07","04-09","05-title","05-01","05-03","05-06","05-08","05-09","05-11","05-13","06-title","06-01","06-03","06-05","06-07","06-09","06-12","06-15","07-title","07-01","07-04","07-07","07-09","07-11","07-13","07-15","08-title","08-01","08-03","08-06","08-08","08-10","08-12","08-13","09-title","09-01","09-03","09-05","09-07","09-10","09-13","09-16","09-18","09-20","10-title","10-01","10-03","10-05","10-08","10-10","11-title","11-01","11-03","11-06","11-08","11-10","11-13","11-16","11-18","11-19","11-15","12-title","12-01","12-03","12-05","12-07","12-10","12-11","12-13","13-title","13-01","13-05","13-07","13-09","14-title","14-01","14-03","14-06","14-08","14-09","14-11","14-13","14-17","14-19","15-title","15-01","15-02","15-03","15-05","15-07","16-title","16-01","16-02","16-03","16-04","16-08","16-10","16-12","16-15","16-17","16-20","17-title","17-01","17-03","17-06","17-08","17-09","17-11","17-12","17-15","17-16","17-18","18-title","18-01","18-04","18-07","18-09","18-11","18-14","18-15","18-18","18-21","18-23","19-title","19-01","19-03","19-06","19-07","19-09","19-11","19-14","19-17","19-19","19-21","19-05","20-title","20-01","20-04","20-05","20-07","20-09","20-11","20-13","21-title","21-01","21-03","21-05","21-07","21-09","21-14","21-16","21-18","21-21","21-23","21-26","22-title","22-01","22-03","22-06","22-08","22-10","22-12","22-14","22-16","22-17","22-18","22-20","21-11","13-13","13-15","13-18","13-03","12-15","13-11","14-14"]}
\ No newline at end of file