diff --git a/05/09.txt b/05/09.txt
index 5938f327..70bd6e3a 100644
--- a/05/09.txt
+++ b/05/09.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 9 Chami'iso'qui esehua'a Israel ttö̧ja̧ tturuhuotörö; jitötä a̧möcuädäcuäu  iyäcuähuinätu̧cu̧ ujutumä jahuätörö TÖ̧Ä̧NÄ̧HUA̧ i̧mi̧nä̧ adiunätä̧  'cuäopatöja̧ pä'ätöjä̧. \v 10 Pi̧yȩ a̧mu̧cuädi - ucu burötö̧ te'ätönä ttu̧huä̧mä̧da̧ pä'ö  i̧sä̧ta̧ huȩnä̧huo̧tö̧nä̧ä̧ huö̧mä̧, ja̧hua̧ta̧'a̧nö̧ ucu juhuä̧mä̧nä̧tä̧ cue'ächömä̧
-=======
-\v 9 Chami'iso'qui esehua'a Israel ttö̧ja̧ tturuhuotörö; jitötä a̧möcuädäcuäu  iyäcuähuinätu̧cu̧ ¡jutumä jahuätörö TÖ̧Ä̧NÄ̧HUA̧ i̧mi̧nä̧ adiunätä̧  'cuäopatöja̧ pä'ätöjä̧! \v 10 Pi̧yȩ a̧mu̧cuädi - ucu burötö̧ te'ätönä ttu̧huä̧mä̧da̧ pä'ö  i̧sä̧ta̧ huȩnä̧huo̧tö̧nä̧ huö̧mä̧, ja̧hua̧ta̧'a̧nö̧ ucu juhuä̧mä̧nä̧tä̧ jahuätöcu cue'ächömä.
->>>>>>> refs/heads/new
diff --git a/06/13.txt b/06/13.txt
index 1a7bc5c9..dbaf47f1 100644
--- a/06/13.txt
+++ b/06/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 13 Gedeón ja̧u̧ru̧ pä'inö, "Oh, CHU̧RU̧HUA̧; isopäi'önä TÖ̧Ä̧NÄ̧HUA̧ ujutucu ö̧jö̧ttö̧mä̧, ¿pi̧yȩ o'cajuiyönämä̧ tta̧'a̧nö̧ pä'ö ja̧hua̧nö̧ 'cuäopä̧'chä̧u̧jä̧ttö̧? ¿Tȩnȩ jä̧ttö̧ tä̧do̧tö̧mi̧nä̧ o'ca  juiyö öadihuä jȩi̧nö̧,  ujuturu jittähuinömä? Jahuätö jittähui'änömä ¿Egiptottö rä'epö icuinömä TÖ̧Ä̧NÄ̧HUA̧MÄ̧CÖ̧ ji̧na̧'a̧ tä̧ji̧? Ja̧hua̧nö̧ ja̧'a̧nä jitämä TÖ̧Ä̧NÄ̧HUA̧MÄ Madián ttu̧mu̧nä̧tä̧ iyipu jaroinäu̧jä̧.
-=======
-\v 13 Gedeón pä'inö ja̧u̧ru̧: "oh, ttö CHI̧Ä̧NÄ̧HUA̧; isopäi'inä TÖ̧Ä̧NÄ̧HUA̧ ujutucu ö̧jö̧ttö̧mä̧, ¿Jahuanö jö̧ttö̧mä̧; tocu pä'ö 'cuä'opätö pi̧yȩ o'cajuiyönämä? ¿Tene ka̧'a̧cuä̧ o'ca juiyönä iadihuä jȩi̧nö̧mä̧, tä̧do̧tö̧mi̧nä̧ jittähuinömä ujuturu? Jahuätömä pä'inätö, ¿TÖ̧Ä̧NÄ̧HUA̧MÄ̧CÖ̧ ji̧na̧ tä̧ji̧ Egitottö rä'opu icuinömä? ja̧hua̧nö̧ ja̧'a̧ jitämä TÖ̧Ä̧NÄ̧HUA̧ jaroäujä ja̧hua̧nö̧ ja̧'a̧ttö̧ Madian ttu̧mu̧nä̧tö̧ iyö ujuninäu̧jä̧.
->>>>>>> refs/heads/new
diff --git a/06/28.txt b/06/28.txt
index d685103a..1b325b83 100644
--- a/06/28.txt
+++ b/06/28.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 28 \v 29 Pä'i mo̧ro̧ ää̧ö̧ö
-=======
 \v 28 Ötahuiyä ttö̧ja̧mä̧ pä'ötä mo̧ro̧ päia'a ö̧rä̧mi̧'i̧nä̧tö̧, yapare jȩpu̧ icuähuina'a, ja̧hua̧nö̧ ja̧'a̧nä̧ yapare ttö̧ä̧nä̧hua̧ i̧so̧'quȩ Asera pä'ö mi̧co̧'quȩ'i̧nä̧ ippeyenä päiomenä pä'äjita'anö päcäyä buorö yapare ttö̧ä̧nä̧hua̧ päi'önä kuicu iyähuome aditinätö̧. \v 29 Bäreu ötahuiyä ttö̧ja̧mä̧ jitätä tta̧mo̧nä̧ tta̧hua̧ru̧hua̧cu̧ pä'ä 'chäcuähuinätö̧, ¿"Di jä̧ttö̧ po pa'anö jȩpi̧nö̧mä̧?" pä'äjita'anö jitötätä ya̧cu̧pu̧nä̧ ka̧ra̧ ka̧ra̧nö̧ ucuocuäcuähuinätö̧ ja̧hua̧ta̧'a̧nö̧ usinätö̧ ttädatatö pä'ö, jahuätömä pä'inätö̧, Gedeon Joás i̧tti̧tä̧ ja̧'a̧ pi̧yȩ pa̧'a̧nö̧ jȩpä̧ji̧mä̧.
->>>>>>> refs/heads/new
diff --git a/manifest.json b/manifest.json
index 07093ef5..afd67290 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":14},"target_language":{"id":"pid","name":"Piaroa","direction":"ltr"},"project":{"id":"jdg","name":"Judges"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg","name":"Regular"},"source_translations":[{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2023-02-22T15:56:51.8485812+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"}],"parent_draft":{},"translators":["alex","Piaroa","Alexandri Cardozo","Alexandri_Cardozo","Favio Alexandri Cardozo Gonzalez","Benjamin","benjamin Sanchez","gabriel_sanchez","Pedro Lara","Jivis","Piaro"],"finished_chunks":["front-title","01-title","01-01","01-04","01-06","01-08","01-11","01-14","01-16","01-18","01-20","01-22","01-25","01-27","01-29","01-30","01-31","01-33","01-34","02-title","02-01","02-03","02-06","02-09","02-11","02-14","02-16","02-18","02-20","03-title","03-01","03-04","03-07","03-09","03-12","03-15","03-16","03-19","03-21","03-24","03-26","03-28","03-31","04-title","04-01","04-04","04-06","04-08","04-10","04-11","04-12","04-14","04-15","04-19","04-21","04-23","05-title","05-01","05-03","05-05","05-07","05-11","05-12","05-14","05-15","05-16","05-17","05-19","05-21","05-23","05-24","05-26","05-28","05-29","05-31","06-01","06-03","06-05","06-07","06-09","06-11","06-13","06-14","06-16","06-19","06-33","06-31","06-30","06-25","06-22","06-21","04-17","07-07","07-09","07-15","07-17","07-22","07-24","08-08","08-10","08-11","08-13","08-22","08-24","08-34","09-07","09-09","09-12","09-15","09-26","09-28","09-44","09-50","09-55","05-09","06-27","06-28","06-34","06-36","06-38","06-39","07-title","07-01","07-02","07-04","07-05","07-12","07-13"]}
\ No newline at end of file
+{"package_version":7,"format":"usfm","generator":{"name":"ts-android","build":14},"target_language":{"id":"pid","name":"Piaroa","direction":"ltr"},"project":{"id":"jdg","name":"Judges"},"type":{"id":"text","name":"Text"},"resource":{"id":"reg","name":"Regular"},"source_translations":[{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2023-02-22T15:56:51.8485812+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2022-10-13T17:31:04.3289954+00:00","version":"1.9"},{"language_id":"es-419","resource_id":"ulb","checking_level":"3","date_modified":"2023-02-22T15:56:51.8485812+00:00","version":"1.9"}],"parent_draft":{},"translators":["alex","Piaroa","Alexandri Cardozo","Alexandri_Cardozo","Favio Alexandri Cardozo Gonzalez","Benjamin","benjamin Sanchez","gabriel_sanchez","Pedro Lara","Jivis","Piaro"],"finished_chunks":["front-title","01-title","01-01","01-04","01-06","01-08","01-11","01-14","01-16","01-18","01-20","01-22","01-25","01-27","01-29","01-30","01-31","01-33","01-34","02-title","02-01","02-03","02-06","02-09","02-11","02-14","02-16","02-18","02-20","03-title","03-01","03-04","03-07","03-09","03-12","03-15","03-16","03-19","03-21","03-24","03-26","03-28","03-31","04-title","04-01","04-04","04-06","04-08","04-10","04-11","04-12","04-14","04-15","04-19","04-21","04-23","05-title","05-01","05-03","05-05","05-07","05-11","05-12","05-14","05-15","05-16","05-17","05-19","05-21","05-23","05-24","05-26","05-28","05-29","05-31","06-01","06-03","06-05","06-07","06-09","06-11","06-14","06-16","06-19","06-33","06-31","06-30","06-25","06-22","06-21","04-17","07-07","07-09","07-15","07-17","07-22","07-24","08-08","08-10","08-11","08-13","08-22","08-24","08-34","09-07","09-09","09-12","09-15","09-26","09-28","09-44","09-50","09-55","06-27","06-34","06-36","06-38","06-39","07-title","07-01","07-02","07-04","07-05","07-12","07-13"]}
\ No newline at end of file