diff --git a/02/01.txt b/02/01.txt
index 056b42e..1c9a4d7 100644
--- a/02/01.txt
+++ b/02/01.txt
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
 Sampiayu mainturun ndiki'
 
 \v 1 Sasoen tuu Pentakosta, ira sikapulung pa sera pada. \v 2 Long jien idalinga de suanen, aso riut sampai gado na idalingaen. \v 3 Pa dibona uluna ira jien ikita lila'-lila' kena unggun. \v 4 Ira long dapano'i Sampiayu long manyaruk loloa' lam ambat rapan tilino kena yang dabareangen lena Sampiayu.
-=======
-\v 1 Sasoen tuu Pentakosta, ira sikapulung pa sera pada.
-\v 2 Long jien idalinga de suanen, aso riut sampai gado na idalingaen.
-\v 3 Pa dibona uluna ira jien ikita lila'-lila' kena unggun.
-\v 4 Ira long dapano'i Sampiayu long manyaruk loloa' lam ambat rapan tilino kena yang dabareangen lena Sampiayu.
->>>>>>> refs/heads/new
diff --git a/front/title.txt b/front/title.txt
index 3f7cea2..141a50e 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 Barerean Kon Rasul
-=======
-Acts
->>>>>>> refs/heads/new
diff --git a/manifest.json b/manifest.json
index 65c3379..26e4ba6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dayak Kalis","direction":"ltr","anglicized_name":"","region":"Asia","is_gateway_language":false,"id":"emb-x-kalis"},"format":"usfm","resource":{"id":"reg"},"translators":["M.Y.I. Deddy Malik"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180207,"version":"2016"}],"finished_chunks":["02-01","02-05","02-08","02-12","02-14","02-16","02-18","02-22","02-20","02-25","02-27","02-29","02-32","02-34","02-37","02-40","02-43","02-46"]}
\ No newline at end of file
+{"project":{"id":"act","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":176},"package_version":7,"target_language":{"name":"Dayak Kalis","direction":"ltr","anglicized_name":"","region":"Asia","is_gateway_language":false,"id":"emb-x-kalis"},"format":"usfm","resource":{"id":"reg"},"translators":["M.Y.I. Deddy Malik"],"source_translations":[{"language_id":"id","resource_id":"ayt","checking_level":"3","date_modified":20180207,"version":"2016"}],"finished_chunks":["02-05","02-08","02-12","02-14","02-16","02-18","02-22","02-20","02-25","02-27","02-29","02-32","02-34","02-37","02-40","02-43","02-46"]}
\ No newline at end of file