diff --git a/01/09.txt b/01/09.txt
index 0de89ef..2bf0329 100644
--- a/01/09.txt
+++ b/01/09.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 9 Mikael saja sang penghulu malekat, waktu palakat nawan setan* tentang bangkai Musa*. bakoi maleh ngantuh kata-kata hujatan geaye melainkan ekat ngantuh kiraki Tuhan nyangit kayo!"
-\v 10 Akan tetapi, ire panyasat iti menghujat hal-hal sa bakoi kanarasa, ire saekat sakanarasa ire berdasarkan naluri, ngalut  satua sabakoi baakal.Oleh hal-hal itilah irekakan dekanahancur.
-\v 11 Celakalah irehaot umba lalan sa detampuh kain,denutah nihi bakuhu kasala sadeulah Bileam, sa binasa gana pembrontakan ngalut Korah.
-=======
 \v 9 Mikael saja sang penghulu malekat, waktu palakat nawan setan* tentang bangkai Musa*. bakoi maleh ngantuh kata-kata hujatan geaye melainkan ekat ngantuh kiraki Tuhan nyangit kayo!" \v 10 Akan tetapi, ire panyasat iti menghujat hal-hal sa bakoi kanarasa, ire saekat sakanarasa ire berdasarkan naluri, ngalut  satua sabakoi baakal.Oleh hal-hal itilah irekakan dekanahancur. \v 11 Celakalah irehaot umba lalan sa detampuh kain,denutah nihi bakuhu kasala sadeulah Bileam, sa binasa gana pembrontakan ngalut Korah.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:Paulinus_IT_kalimantan/duw-x-dusunpepas_jud_text_reg.git
diff --git a/manifest.json b/manifest.json
index 37549e4..c9eb28f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"jud","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dusun Pepas","direction":"ltr","anglicized_name":"Dusun Pepas","region":"Asia","is_gateway_language":false,"id":"duw-x-dusunpepas"},"format":"usfm","resource":{"id":"reg"},"translators":["Paulinus_IT_kalimantan","Anwar Andreas"],"source_translations":[{"language_id":"ayt","resource_id":"ulb","checking_level":"3","date_modified":-1,"version":"1"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"}],"finished_chunks":["01-title","01-09","01-12","01-14","01-24","01-22","01-17","01-20","front-title","01-01","01-03","01-05","01-07"]}
\ No newline at end of file
+{"project":{"id":"jud","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dusun Pepas","direction":"ltr","anglicized_name":"Dusun Pepas","region":"Asia","is_gateway_language":false,"id":"duw-x-dusunpepas"},"format":"usfm","resource":{"id":"reg"},"translators":["Paulinus_IT_kalimantan","Anwar Andreas"],"source_translations":[{"language_id":"ayt","resource_id":"ulb","checking_level":"3","date_modified":-1,"version":"1"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"},{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180816,"version":"2016"}],"finished_chunks":["01-title","01-12","01-14","01-24","01-22","01-17","01-20","front-title","01-01","01-03","01-05","01-07","01-09"]}
\ No newline at end of file