diff --git a/16/22.txt b/16/22.txt
index a59f2a9d..562da58b 100644
--- a/16/22.txt
+++ b/16/22.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-V/22 La liemba lio liasunjelabo, la Bekondi be bebeko, ko bepinolabo tshulu yabo, la opaa ndole mpo yotobabo la ohala tshulu yabo.      V/23 Gombise yabo otobabo beambo, bobo baatabo goete boloko, ko bebegisia bokengi bo boloko yoletabo la liangee liboongene. V/24 Bekengi be boloko, gowebo galo, bobo baatabo goete boloko, la bobo baandabo la belii mo baolo.
-=======
 \v 22 La liemba lio liasudjelabo, la bekodji be bebeko,ko befinolabo tulu yaabo,laa ofa ndole mpo yotobabo la ohala tulu yaabo.\v 23 Gombisa yaabo biambo,bobo batabo goete Bayaka,ko bebegisa singili ye Bayaka oletabo la liange li longene.\v 24 Singili ye Bayaka ,gaoebo galo,bobo baatabo goete Bayaka,la bobo baandabo la belii mo baolo.
->>>>>>> refs/heads/new
diff --git a/manifest.json b/manifest.json
index d5bba9dd..09766dd4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Botoki","direction":"ltr","anglicized_name":"Botoki","region":"Africa","is_gateway_language":false,"id":"kmw-x-botoki"},"format":"usfm","resource":{"id":"reg"},"translators":["FAUSTIN azaza","faustin azaza"],"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"},{"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":"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":["front-title","01-title","06-01","06-02","06-05","06-07","06-08","06-10","06-12","16-22","16-25","16-27","16-29","16-32","16-35","16-37","16-40","17-title","17-01","17-03","17-05","17-08","17-10","17-13","17-16","17-18","17-19","17-22","17-24","17-26","17-28","17-30","17-32","18-title","18-01","18-04","18-07","18-12","18-14","18-16","18-18","18-20","18-22","18-24","18-27","19-title","19-01","19-03","19-05","19-08","19-11","19-13","19-15","19-18","19-21","19-23","19-26","19-28","19-30","19-33","19-35","19-38","20-title","20-01","20-04","20-07","20-09","20-11","20-13","20-15","20-17","20-22","20-25","18-09","20-28","20-31","20-33","20-36","01-01","01-04","01-06","01-09","01-12","01-15","01-17","01-20","01-21","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","06-title","12-title","13-title","15-title","21-title","21-01","21-03","21-05","21-07","21-10","21-12","21-15","21-17","21-20","21-22","21-25","21-27","21-30","21-32","21-34","21-37","21-39","04-title","04-01","04-05","04-08","04-11","04-13","04-15","04-19","04-21","04-23","04-26","04-27","04-29","04-32","04-34","04-36","22-title","22-01","22-03","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","10-title","10-01","10-03","10-07","10-09","10-13","10-17","10-19","10-22","10-24","10-25","10-27","10-30","10-34","10-36","10-39","10-42","10-44","10-46","12-05","12-07","12-09","12-11","12-13","12-16","12-18","12-20","12-22","12-24","13-01","13-04","13-06","13-09","13-11","13-13","13-16","13-19","13-21","13-23","13-26","13-28","13-30","13-32","13-35","13-38","13-40","13-42","13-44","13-46","13-48","13-50","14-title","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","15-01","15-03","15-05","15-07","15-10","15-12","15-13","15-15","15-19","15-22","15-24","15-27","15-30","15-33","15-36","15-39","16-title","16-01","16-04","16-06","16-09","16-11","16-14","16-16","16-19"]}
\ No newline at end of file
+{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":2},"package_version":7,"target_language":{"name":"Botoki","direction":"ltr","anglicized_name":"Botoki","region":"Africa","is_gateway_language":false,"id":"kmw-x-botoki"},"format":"usfm","resource":{"id":"reg"},"translators":["FAUSTIN azaza","faustin azaza"],"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"},{"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":"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":["front-title","01-title","06-01","06-02","06-05","06-07","06-08","06-10","06-12","16-25","16-27","16-29","16-32","16-35","16-37","16-40","17-title","17-01","17-03","17-05","17-08","17-10","17-13","17-16","17-18","17-19","17-22","17-24","17-26","17-28","17-30","17-32","18-title","18-01","18-04","18-07","18-12","18-14","18-16","18-18","18-20","18-22","18-24","18-27","19-title","19-01","19-03","19-05","19-08","19-11","19-13","19-15","19-18","19-21","19-23","19-26","19-28","19-30","19-33","19-35","19-38","20-title","20-01","20-04","20-07","20-09","20-11","20-13","20-15","20-17","20-22","20-25","18-09","20-28","20-31","20-33","20-36","01-01","01-04","01-06","01-09","01-12","01-15","01-17","01-20","01-21","25-01","25-04","25-06","25-09","25-11","25-13","25-17","25-21","25-23","25-25","06-title","12-title","13-title","15-title","21-title","21-01","21-03","21-05","21-07","21-10","21-12","21-15","21-17","21-20","21-22","21-25","21-27","21-30","21-32","21-34","21-37","21-39","04-title","04-01","04-05","04-08","04-11","04-13","04-15","04-19","04-21","04-23","04-26","04-27","04-29","04-32","04-34","04-36","22-title","22-01","22-03","22-06","22-09","22-12","22-14","22-17","22-19","22-22","22-25","22-27","22-30","10-title","10-01","10-03","10-07","10-09","10-13","10-17","10-19","10-22","10-24","10-25","10-27","10-30","10-34","10-36","10-39","10-42","10-44","10-46","12-05","12-07","12-09","12-11","12-13","12-16","12-18","12-20","12-22","12-24","13-01","13-04","13-06","13-09","13-11","13-13","13-16","13-19","13-21","13-23","13-26","13-28","13-30","13-32","13-35","13-38","13-40","13-42","13-44","13-46","13-48","13-50","14-title","14-01","14-03","14-05","14-08","14-11","14-14","14-17","14-19","14-21","14-23","14-27","15-01","15-03","15-05","15-07","15-10","15-12","15-13","15-15","15-19","15-22","15-24","15-27","15-30","15-33","15-36","15-39","16-title","16-01","16-04","16-06","16-09","16-11","16-14","16-16","16-19","16-22"]}
\ No newline at end of file