diff --git a/03/03.txt b/03/03.txt
index b1d85e6a..d09220d3 100644
--- a/03/03.txt
+++ b/03/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 3 Haqan Yesus amenin emim bilam, Ya helmo nibilenaiq ham. Mat aw nog in zaway ulilibta na amalib gime gigerta mutur a ta hi gwahtiqeq in  God ago maror aduganib le a hi gwahtiq daqay ham. \v 4 Haqan Nikodemus bilam, Mat nengab tiqiyta ezaq toneq ame gigerta mutur a ta gwahtiqad? ham. In anen agemab a ta lehid anen a ta emdaq e? ham.
-=======
-\v 3 Haqan Yesus in amenin bulon, ya helmo nibilenaiq ham. Mat aw nog in zaway ulilibta na amalib gimme gigerta murmur a ta hi gwahtiqeq in God ago maror aduganib le a hi gwahtiq daqay ham. \v 4 Haqan Nikodemus bilam, mat nenaqab tiqiyta ezaq toneq ame gigerta murmur a ta gwahtiqdaq? ham. In amen agemab a ta lehid anen a ta emdaq e? ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/05.txt b/03/05.txt
index 0defde0c..21055a84 100644
--- a/03/05.txt
+++ b/03/05.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 5 Haqan Yesus bilam,Ya helmo nibilenaiq ham. On mataw yuw teq God ago Bugaw ago zaway gimalib mutur a hi iyeq in God ago maror aduganib le a hi gwahtiq daqay ham. \v 6 On mataw og kabta in onmin in gimo gihol nogta giqemayta ham. Sa God ago Bugaw in onmin inmo nogta giqemaqtaham.
-=======
-\v 5 Haqan Yesus bilam, ya helmo nibilenaiq ham. On mataw yuw teq God ago Bugaw ago zaway gimalib mutur a hi iyan in God ago maror aduganib le a hi gwahdaq daqay ham. \v 6 On mataw og kab in onmin in gimo nogta giqemayta ham. Sa God ago Bugaw in onmin ninmo nogta giqemaqta ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/07.txt b/03/07.txt
index 4d2064a6..1ab74636 100644
--- a/03/07.txt
+++ b/03/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 7  Ya nibilenim bilay, Ni zaway ulilibta na amalib nime gigerta mutur a ta hi gwahtiqeq ni God ago maror aduganib le a hi gwahtiqdaq hayta na ago ni ninadnad hi em ham. \v 8 Tim anadibmo saw bunmo lehaqta ham. Lehsa ni ahulanmo huritaqta ham. Huritad in ezaq bolta na teq in ezaq lehaqta na ago ni a hi huritaqta ham. Ari God ago Bugaw bolim mataw giqeman gimugan mutur iyayta na in nazaqmo ham.
-=======
-\v 7 Ya nibilenim bilay, ni zaway ulilibta na amalib nime gigerta mutur a ta hi gwahtiqeq ni God ago maror aduganib le a hi  gwahtiqdaq hayta na ago ni ninadnad hi em ham. \v 8 Tim anadibmo lehdaqta ham. Lehsa ni ahulanmo huritaqta ham. Huritad in ezaq bolta na in ezaq lehaqta na ago ni a hi huritaqta ham. Ari God ago Bugaw bolim mataw giqeman gimugan  mutur iyayta an in nazaqmo ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/09.txt b/03/09.txt
index 5fffe306..ba46a69a 100644
--- a/03/09.txt
+++ b/03/09.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 9  Haqan Nikodemus bilam, Daq nazaqta na ezaq teq in giholib gwahtiqdaq? ham. \v 10 An Yesus bulon, Na ta ezaq? ham. Ni Isrel gigo tisa araq ham. Ezaq tonim ni nagah ka ago ninad a hi em hasaq? ham. \v 11 Ya helmo nibilenaiq ham. I nagah ginad tiqem hasta naqmo agamukan bilaqauq ham. Bilaqad i nagah gimeb ahol tuwawta naqmo ago i ne gibilenauq ham. Teq ne i gigo gamuk na gileh ugayta ham.
-=======
-\v 9 Haqan Nikodemus bilam, daq nazaqta na teq i giholib g wahtiqdaq? ham. \v 10 An Yesus bulon, na ta ezaq? ham. Ni Isrel gigo Tisa araq ham. Ezaq tonim ni nagah ka ago ninad a hi em Hasan? ham. \v 11 Ya helmo nibilenaiq ham. I nagah ginad hasta naqmo agamukan bilaqauq ham. Bilaqa i nagah gimeb gimeb ahol tuwawta naqmo ago i ne gibilenauq ham. Teq ne i gigo gamuk na gileh ugaytaham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/12.txt b/03/12.txt
index f3484b8e..1477ac40 100644
--- a/03/12.txt
+++ b/03/12.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12  Ya nagah og kabta ago gibilensa ne anan helmo a hi haqayta ham. Ta ezaq teq ya nagah Heven-ibta na ago gibilenid ne anan helmo haq daqay? ham. \v 13 Mat araq Heven-ib a hi gwalahta ham. Haiq ham. Mat Atatin Heven hulosim hitimta naqmo amomo Heven ahol wamta ham.
-=======
 \v 12 Ya nagah og kabta ago gibilensa ne anan helmo a hi haqayta ham. Ta ezaq teq ya nagah Heven-ibta na ago gibilenid ne anan helmo haq daqay? ham. \v 13 Mat araq Heven-ib a hi gwalahta ham. Haiq ham. Mat Atatin Heven hulosim Heven ahol wamta ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/14.txt b/03/14.txt
index 5adba707..d9be0ca2 100644
--- a/03/14.txt
+++ b/03/14.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 14 Teq Moses kwaziqmo saw samantab nagah ahulinaqta adulan wazan eramta nazaqmo mataw in Mat Atatin wazid eraqeq titurdaqmo ham. \v 15 Eraqeq tursa teq on mataw in ahol waqad anan ahelmo haq daqayta na bunmo in kayeqmo kuluwa-kuluwmo tuqos daqay ham.
-=======
 \v 14 Teq Moses kwaziqmo saw samanta nagah ahulinaqta adulan wazim eramta nazaqmo mataw in mat Atatin wazid eraqeq titurdaqmo ham. \v 15 Eraqeq tursa teq on mataw in ahol waqad anan helmo haq daqayta na bunmo in Kayeqmo kuluwa-kuluwmo tuqos daqay ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/16.txt b/03/16.txt
index ad437d62..f21a913d 100644
--- a/03/16.txt
+++ b/03/16.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 16  Ari God in on mataw og saw bunmo ginan anad bilaqsa iyan in atatin amulikmo osta na tinag. In atatin negid mat aw nog atatin na anan helmo haq daqayta na bunmo a hi moq hasad in kayeqmo tuteqmo tuqos daqay haqad in nazaq amta. \v 17 Na ezaqmo in atatin on mataw gilum kemeq eman og kab a hi bol. Haiqgam. In anad am, Ya itatin leheq on mataw gimen dante wastitayid ya gilumsiheq giwaqid a hi moq daqay haqad in atatin eman bolta. \v 18 Nazaq iyan on mataw God atatin anan helmo haqayta na bunmo in God ameb dimunmo osayta. God in giyon bilaqan in moq hasgo a hi osayta. Ari on mataw God atatin anan helmo a hi haqayta na God in giyon tibilaqan in moq hasgo tigiyim osayta. Na ezaqgo in God atatin amulik na anan helmo a hi haqayta na ago iyan.
-=======
-\v 16 Ari God in on mataw og saw bunmo ginan anad bilaqsa iyan in atatin amulikmo osta na tinag. In Atatin nagid mat aw nog atatin na anan helmo haq daqayta na bunmo a hi moq hasad in kayeqmo tuteqmo tuqos daqay haqad in nazaq amta. \v 17 Na ezaqmo in Atatin on mataw gilum kemeq giyon bileqid moq baqay haqad in eman og kab a hi bol. Haiqgam. In anad am, ya Atatin on mataw gimen dante wsatitayid ya gilumsiheq giwaqid a hi moq daqay haqad in Atatin emqn bolta.\v 18 Nazaq iyan on mataw God Atatin anan helmo haqayta na bunmo in God ameb dimunmo osayta bilaqan in moq hosgo a hi osayta. Ari on mataw God Atatin anan helmo a hi haqayta na God in giyon tibilaqan in moq hasgo tiqiyim osayta. Ne ezaqgo in God Atatin amulikmo na anan helmo a hi haqayta na ago iyan.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/19.txt b/03/19.txt
index 36f10e1d..d5a72929 100644
--- a/03/19.txt
+++ b/03/19.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19  Teq God on mataw gilum kemim gigo daq amenin negaqta na alulin in kazaq. Saw anuwan og kab tugwahtim. Gwahtiqan teq on mataw saw anuwan an anan ginad a hi bilam. Haiqgam. On mataw na gigo daq bunmo meqin iyim iyan in romriqmo anan ginad bilam. \v 20 Na ezaqgo on mataw daq meqinta emayta na in saw anuwan anan ginad a hi bilaqsa in saw anuwanib a hi gwahtiqayta, Luweq in gigo daq meqinta nagan ulal iydaq haqad. \v 21 Ari on mataw daq helta emayta na in saw anuwan ahol waqad bolayta.In God anad muzinim daq emayta nagan ulal iydaq haqad in saw anuwanib nab bo tugwahtiqayta.*
-=======
 \v 19 Teq God on mataw gilum kemim gigo daq amenin negaqta na alulin in kazaq. Saw anuwan og kab tugwahtiq. Gwahtiqan teq on mataw saw anuwan na anan ginad a hi bilam. Haiqgam. On mataw na gigo daq bunmo meqin iyim iyan in romriqmo anan ginad bilam. \v 20 Na ezaqgo on mataw daq meqinta emayta na in saw anuwan anan ginad a hi bilaqsa in saw anuwanib a hi gwahtiqayta, luweq in gigo daq meqinta nagan ulal iydaq Haqad. \v 21 Ari on mataw daq helta emayta na in saw anuwan ahol waqad bolaqta. In God anad muzinim daq emayta nagan ulal iydaq haqad in saw anuwanib nab bo tugwahtiqayqa.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/22.txt b/03/22.txt
index 4aab341d..aa14838e 100644
--- a/03/22.txt
+++ b/03/22.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
 \v 22  Ari daq na tihiqiyan Yesus ago disaipel nenaq saw  Judiya gigo og araqab tilehiy. Lehim in saw nab luw osad teq in on mataw tuhuz negyaq.\v 23 Sa Jon saw nagab on mataw tuhuz negyaqmo. Saw anan Ainon haqayata saw Selim agerab usaqta nab yuw ame ayahta usaqta iyan Jon nab luwyaqta. \v 24 Kam nab Jon a hi irqursamo on mataw kabemmo bolsa in tuhuz negyaq.
-=======
-Jon mataw huz negyaqta na in Yesus anan bilaq siam
-
-\v 22 Ari daq na tihiqiyan Yesus ago disaipel nenaq saw Judiya gigo og araqab tilehiy. Lehim in saw nab law osad teq in on mataw tuhuz negyaq. \v 23 Sa Jon saw nagab on mataw tuhuz negyaqmo. Saw anan Ainon haqayta saw Selim agerab usaqta nab yuw ame ayahta usaqta iyan Jon nab luwyaqta. \v 24 Kam nab Jon a hi irqursamo on mataw kabemmo bolsa in tuhuz negyaq.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/25.txt b/03/25.txt
index 574ddde6..b80295f4 100644
--- a/03/25.txt
+++ b/03/25.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 25 Teq Jon ago disaipel asor in Juda mat araq ìnaq na tumug yaqay.Na in Juda gigo daq araq in gihol huz ugim God ameb gihol abusirinan hiqiyaqta na ago ananin bilaqad an mug yaqay.\v 26 Ad teq in bunmo Jon ago hib bolim tubuloniy, Tisa haqiy, Mat ni ninaq yuw Jodan aqurumum kozaq ban ossa ni anan bilamta na in on mataw tuhuz negaqmo haqiy. Sa on mataw bunmo inmo ago hib tilehay haqiy.
-=======
-\v 25 Teq Jon ago disaipel asor in Juda mat araq inaq an tumug yaqay. Na in Juda gigo daq araq in gihol huz ugim God amen gihol abusirinan hiqiyayta na ago ananin bilaqad an mug yaqay. \v 26 Ad teq in bunmo Jon ago hib boim tubuloniy, Tisa haqiy, mat ni ninaq yuw Jodan aqurumun kazaq ban ossa ni anan bilamta na in on mataw tuhuz negaqmo haqiy. Sa on mataw bunmo inmo ago hib tilehiy haqiy.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/27.txt b/03/27.txt
index be4f63cc..16ae5ec1 100644
--- a/03/27.txt
+++ b/03/27.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 27  Haqan Jon gibilan,God mat abenab kabiy amta naqmo amomo in tiqemdaqta ham. \v 28 Ya kwaziqmo ne gibilenim bilay, Ya Krais a haiq hay ham. God ya iqeman ya Krais ago danmeb bolta haqad ya bilay ham. Ya nazaq bilaqsa ne tuhuritiy ham.
-=======
-\v 27 Haqan Jon gibilan, God mat abenab kabiy amta naqmo amomo in tiaemdaqta ham. \v 28 Ya kwaziqmo ne gibilenim bilam, ya Krais a haqiy hay ham. God ya iqeman ya Krais ago danmeb bolta haqad ya bolay ham. Ya nazaq bilaqsa ne tuhuritiy ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/29.txt b/03/29.txt
index b6f43402..61fe5c91 100644
--- a/03/29.txt
+++ b/03/29.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 29  Mat aw wamta naqmo in aw na aduw diq ham.Teq mat na ayow in adek emim turad in ayow aw wamta na aqez huritad in anad ayahmo dimniyaq ham. Nazaq iyan muran ya inad tidimniy hasaq ham. \v 30 Mat ko abin ayah tiqiydaq ham. Sa ya ibin amik iydaq ham.
-=======
-\v 29 Mat as wamta naqmo in aw na aduw diq ham. Teq mat na ayow in adek emim turad in ayow aw wamta na aqez huritad ayahmo dimniyaq ham. Nazaq iyan muran ya inad tidimniy hasan ham. \v 30 Mat ko abin ayah tiqiydaq ham. Sa ya ibin amik iydaq ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/31.txt b/03/31.txt
index 31d2bf65..44bdd7ea 100644
--- a/03/31.txt
+++ b/03/31.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 31  Ari Mat ulilib osim bolta naqmo in nagah bunmo gigo Iyahta iyim osaqta.Teq mat abe alulin og kab usaqta na in og kabta iyim iyan in og kaqmo ago nagayta anan bilaqaqta.Ari mat Heven-ib  osim bolta na in nagah bunmo gigo Iyahta iyim osaqta. \v 32 Osad in nagah ameb ahol wamta na teq in gamuk huritta naqmo in i gibilenaqta.Ta teq mataw in ago gamuk na anan helmo a hi haqayta. \v 33 Ari on mataw in ago gamuk huritim anan helmo haqayta na in kazaq i gibilenay.God gamuk heltaqmo bilaqaqta haqay.
-=======
-\v 31 Ari mat ulilib osim bolta naqmo in nagah bunmo gigo Iyahta iyim osaqta. Teq mat abe alulin og kab usaqta na in og kabta iyim in og kaqmo ago nagahta anan bilalaqta. Ari mat Heven-ib osim bolta na in nagah bunmo gigo Iyahta iyim osaqta. \v 32 Osad in nagah nab ahol wamta na teq in gamuk huritta naqmo in i gibilenaqta. Ta teq mataw in ago gamuk na anan helmo a hi haqayta. \v 33 Ari on mataw in gigo gamuk huritim anan helmo haqayta na in kazaq i gibilenan. God gamuk heltaqmo bilaqaqta haqay.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/03/34.txt b/03/34.txt
index 1f0b0b91..965651a8 100644
--- a/03/34.txt
+++ b/03/34.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 34  Na ezaqgo God in ago Bugaw Dimunta ayahmo mat na ugim teq in eman bolim in God ago gamukmo diq bilaqaqta. \v 35 Amam in atatin na anan anad diq bilaqsa in zaway bunmo atatin abenab tiqam. \v 36 Nazaq iyan on mataw God atatin anan helmo haqayta na in kayeqmo Kuluwa-Kuluwmo tuqos daqay. Ari mat God atatin ago gamuk othasaqta na in kayeqmo kuluwa-kuluwmo a hi osdaq. Haiqgam. God in mat naqanta agem meqinta ugsa in osaqta.*
-=======
 \v 34 Na ezaqgo God in ago Bugaw dimunta ayahmo mat na ugim teq ni eman bolim in God ago gamukmo diq bilaqaqta. \v 35 Aman in atatin na anan anad diq bilaqsa in zaway bunmo atatin abenab tiqem.\v 36 Nazaq iyan on mataw God atatin anan helmo haqayta na in kayeqmo kuluwa-kuluwmo tuqos daqay. Ari mat God atatin ago gamuk othasaqta na in kayeqmo kuluwa-kuluwmo a hi osdaq. Haiqgam. God in mat naqanta agem meqinta ugsa in osaqta.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/04/title.txt b/04/title.txt
index 7e83a16e..790a631c 100644
--- a/04/title.txt
+++ b/04/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 Sapta 4
-=======
-Chapter 4
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/12/title.txt b/12/title.txt
index cf3c0622..9e2d3934 100644
--- a/12/title.txt
+++ b/12/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 chapter 12
-=======
-Sapta 12
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/21/10.txt b/21/10.txt
index e0ca363e..a3c4322d 100644
--- a/21/10.txt
+++ b/21/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Saqmo Yesus gibilan, Ne nabiq muran waqiyta na asor a boliy ham. \v 11Haqanmo Saimon Pita le muyib gwalim dob anabiqnaq na kamisib ussa in wazim hureqan yuw adekib tugwal.Nabiq aseseqta kabemmo diq 153 nazaqmo dobub woqim usta. Teq dob a hi tartay.
-=======
 \v 10 Samo Yesus gibilan, ne nabiq muran waqiyta na asor a boliy ham. \v 11 Haqan Saimon Pita le muyib gwalim dob anabiqnaq na kamisib ussa in wazim hureqan yuw adekib tugal. Nabiq aseseqta kabemmo diq 153 nazaqmo dobub wolim usta. Teq dob a hi tartan.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/21/17.txt b/21/17.txt
index 2cbea7ca..7d5d7f70 100644
--- a/21/17.txt
+++ b/21/17.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 \v 17 Teq Yesus ame ezeqmanta a Pita ta bulonim bilam, Jon atatin Saimon ham ni ya inan ninad bilaqaq e? ham. Haqan Pita nab afaqan tiqiy.Na ezaqgo Yesus ame ezeqmanmo susumun ugim bilam, Ni ya inan ninad bilaqaq e? hamta na ago iyan. Haqan Pita bulon, Iyahta ham ni nagah bunmo ago tuhuritta ham. Ya ninan inad bilaqaqta na ni tuhuritmo ham. Haqan Yesus bulon,Ni yaqgo sipsip didaq neg ham. \v 18 Ya helmo nibilenaiq ham. Ni minmin osad ni nihol wastitayim nihulib am hurorim ni edob lehnan ninad usta nab ni lehmo tilehyaqta ham. Ari abeb ni adinowan tiqiyeq teq ni niben wazid eraqsa mat araq nihulib am huroreq in giwaqeq saw ninad a hi usaqtab niqad tilehdaq ham.
-=======
-\v 17 Teq Yesus ame ezeqmanta a Pits ta bulonim bilam, Jon atatin Saimon ham ni ya inan ninad bilaqaq? ham. Haqan Pita nab afaqan tiqiy. Ni ezaqgo Yesus ame ezeqmanmo susumun ugim bilam, ni ya inan bilaqaq e? hamta na ago iyan. Haqan Pita bulon, Ayahta ham ni nagah bunmo ago tuhuritta ham. Ya ninan inad bilaqaqta na ni tuhuritmo ham. Haqan Yesus bulon, ni yaqgo disaipel didaq neg ham. \v 18 Ya helmo nibilenaiq ham. Ni minmin osad ni nihol wastiayim nihulib am hurorim ni edob lkehnan ninad usta nab ni lehmo tilehyaqta ham. Ari abeb  ni adinowan tiqiyeq teq ni niben wazid eraqsa mat araq nihulib am huroreq saw ninad a hi usaqtab niqad tilehdaq ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/21/19.txt b/21/19.txt
index f6a380de..cfacf3f4 100644
--- a/21/19.txt
+++ b/21/19.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 19 Na Pita daq ezaqta amalib moqad in God abin  emid ayah iydaqta na ago in Pita nazaq bulonta,Haqad in bulon,Ni ya imuzeq bol ham.
-=======
 \v 19 Na Pita daq ezaqta amalib moqad in God abin emid ayah iydaqta na ago in Pita nazaq bulonta. Haqad in bulon, ni ya imuzeq bol ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/21/20.txt b/21/20.txt
index 36f33035..b2a55bc5 100644
--- a/21/20.txt
+++ b/21/20.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
 \v 20 Ari Pita ahol buliyim disaipel Yesus in anan anad bilaqaqta na gimuzim nenaq lehsa in ahol tuwan. Mat naqmo kwaziqmo Yesus ago disaipel nenaq didaq neqad in banab ahol wol emim Yesus anognib us nog iyad in afaqin Yesus abanib emim bulon, Iyahta ham nog giwaqeq bab gibenab niqemdaq? hamta  na amatin. \v 21 Pita in disaipel na ahol waqad teq in Yesus bulon,Iyahta ham mat ko teq ezaq iydaq? ham.
-=======
-Yesus in ago disaipel anan anad bilaqyaqta na anan bilam
-
-\v 20 Ari Pita ahol buliyim disaipel Yesus in anan anad bilaqaqta na gimuzim nenaq lehsa in ahol tuwaq. Mat naqmo kwaziqmo Yesus ago disaipel nenaq didaq neqad in banab ahol wol emim Yesus anognib us nog iyad  in afaqin Yesus abanib emim bulon, Iyahta ham niwaqeq bab gibenab niqemdaq? hamta na amatin. \v 21 Pita in disaipel na ahol waqad teq in Yesus bulon, Iyahta ham Mat ko teq ezaq iydaq? ham.
->>>>>>> branch 'master' of git@wacs.bibletranslationtools.org:PJenkins/mlp-x-kurum_jhn_text_reg.git
diff --git a/manifest.json b/manifest.json
index 0baa17c5..fe314cca 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1 +1 @@
-{"project":{"id":"jhn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Kurum","direction":"ltr","anglicized_name":"","region":"Pacific","is_gateway_language":false,"id":"mlp-x-kurum"},"format":"usfm","resource":{"id":"reg"},"translators":["Bargam","Diyol","Jenkins Pongiura","kurum","k"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"resource_id":"ulb","language_id":"as","date_modified":20161019,"version":"1","checking_level":"3"},{"language_id":"en","resource_id":"ulb","date_modified":20170329,"checking_level":"3","version":"9"},{"resource_id":"udb","language_id":"en","date_modified":20170221,"version":"9","checking_level":"3"}],"finished_chunks":["06-title","12-12","20-title","21-title","08-14","08-12","08-09","08-07","08-04","08-01","08-title","07-53","front-title","01-title","02-title","03-03","03-05","03-07","03-09","03-12","03-14","03-16","03-19","03-22","03-25","03-27","03-29","03-31","03-34","04-title","04-01","04-04","04-06","04-09","04-11","04-13","04-15","04-17","04-19","04-21","04-23","04-25","04-27","04-28","04-31","04-34","04-37","04-39","04-41","04-43","04-46","04-48","04-51","04-53","05-title","05-01","05-05","05-07","05-09","05-10","05-12","05-14","05-16","05-19","05-21","05-24","05-25","05-26","05-28","05-30","05-33","05-36","05-39","05-41","05-43","05-45","06-01","06-04","06-07","06-10","06-13","06-16","06-19","06-22","06-24","06-26","06-28","06-30","06-32","06-35","06-38","06-41","06-60","06-62","06-64","06-66","06-70","07-title","07-01","07-03","07-05","07-08","07-10","07-12","07-14","07-17","07-19","07-21","07-23","07-25","07-28","07-30","07-33","07-35","07-37","07-39","07-40","07-43","07-45","07-47","07-50","06-43","06-46","06-48","06-50","06-52","06-54","06-57","08-17","08-19","08-21","08-23","08-25","08-28","08-31","08-34","08-37","08-39","08-42","08-45","08-48","08-50","08-52","08-54","08-57","09-title","09-01","09-03","09-06","09-08","09-10","09-13","09-16","09-19","09-22","09-24","09-26","09-28","09-30","09-32","09-35","09-39","10-title","10-01","10-03","10-05","10-07","10-09","10-11","10-14","10-17","10-19","10-22","10-25","10-27","10-29","10-32","10-34","10-37","10-40","11-title","11-01","11-03","11-05","11-08","11-10","11-12","11-15","11-17","11-21","11-24","11-27","11-30","11-33","11-36","11-38","11-41","11-43","11-45","11-47","11-49","11-51","11-54","11-56","12-title","12-01","12-04","12-07","12-09","12-14","12-16","12-17","12-20","12-23","12-25","12-27","12-30","12-32","12-34","12-37","12-39","12-41","12-44","12-46","21-01","21-04","21-07","21-10","21-12","21-15","21-17","21-19","21-20","21-22","21-24","13-title","12-48","13-01","13-03","13-06","13-10","13-12","13-16","13-19","13-21","13-23","13-26","13-28","13-31","13-34","13-36","14-title","14-01","14-04","14-08","14-10","14-12","14-15","14-18","14-21","14-23","14-25","14-28","14-30","15-title","15-01","15-03","15-05","15-08","15-10","15-12","15-14","15-16","15-18","15-20","15-23","15-26","16-title","16-01","16-03","16-05","16-08","16-12","16-15","16-17","16-19","16-22","16-25","16-26","16-29","16-32","17-title","17-01","17-03","17-06","17-09","17-12","17-15","17-18","17-20","17-22","17-24","17-25","18-title","18-01","18-04","18-06","18-08","18-10","18-12","18-15","18-17","18-19","18-22","18-25","18-28","18-31","18-33","18-36","18-38","19-title","19-01","19-04","19-07","19-10","19-12","19-14","19-17","19-19","19-21","19-23","19-25","19-28","19-31","19-34","19-36","19-38","19-40","20-01","20-03","20-06","20-08","20-11","20-14","20-16","20-19","20-21","20-24","20-26","20-28","20-30","01-01","01-04","01-06","01-09","01-10","01-12","01-14","01-16","01-19","01-22","01-24","01-26","01-29","01-32","01-35","01-37","01-40","01-43","01-46","01-49","02-01","02-03","02-06","02-09","02-11","02-12","02-13","02-15","02-17","02-20","02-23","03-title","03-01"]}
\ No newline at end of file
+{"project":{"id":"jhn","name":""},"type":{"id":"text","name":"Text"},"generator":{"name":"ts-android","build":14},"package_version":7,"target_language":{"name":"Kurum","direction":"ltr","anglicized_name":"","region":"Pacific","is_gateway_language":false,"id":"mlp-x-kurum"},"format":"usfm","resource":{"id":"reg"},"translators":["Bargam","Diyol","Jenkins Pongiura","kurum","k"],"source_translations":[{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"language_id":"en","resource_id":"udb","checking_level":"3","date_modified":20170221,"version":"9"},{"language_id":"en","resource_id":"ulb","checking_level":"3","date_modified":20170329,"version":"9"},{"resource_id":"ulb","language_id":"as","date_modified":20161019,"version":"1","checking_level":"3"},{"language_id":"en","resource_id":"ulb","date_modified":20170329,"checking_level":"3","version":"9"},{"resource_id":"udb","language_id":"en","date_modified":20170221,"version":"9","checking_level":"3"}],"finished_chunks":["06-title","12-12","20-title","21-title","08-14","08-12","08-09","08-07","08-04","08-01","08-title","07-53","front-title","01-title","02-title","04-01","04-04","04-06","04-09","04-11","04-13","04-15","04-17","04-19","04-21","04-23","04-25","04-27","04-28","04-31","04-34","04-37","04-39","04-41","04-43","04-46","04-48","04-51","04-53","05-title","05-01","05-05","05-07","05-09","05-10","05-12","05-14","05-16","05-19","05-21","05-24","05-25","05-26","05-28","05-30","05-33","05-36","05-39","05-41","05-43","05-45","06-01","06-04","06-07","06-10","06-13","06-16","06-19","06-22","06-24","06-26","06-28","06-30","06-32","06-35","06-38","06-41","06-60","06-62","06-64","06-66","06-70","07-title","07-01","07-03","07-05","07-08","07-10","07-12","07-14","07-17","07-19","07-21","07-23","07-25","07-28","07-30","07-33","07-35","07-37","07-39","07-40","07-43","07-45","07-47","07-50","06-43","06-46","06-48","06-50","06-52","06-54","06-57","08-17","08-19","08-21","08-23","08-25","08-28","08-31","08-34","08-37","08-39","08-42","08-45","08-48","08-50","08-52","08-54","08-57","09-title","09-01","09-03","09-06","09-08","09-10","09-13","09-16","09-19","09-22","09-24","09-26","09-28","09-30","09-32","09-35","09-39","10-title","10-01","10-03","10-05","10-07","10-09","10-11","10-14","10-17","10-19","10-22","10-25","10-27","10-29","10-32","10-34","10-37","10-40","11-title","11-01","11-03","11-05","11-08","11-10","11-12","11-15","11-17","11-21","11-24","11-27","11-30","11-33","11-36","11-38","11-41","11-43","11-45","11-47","11-49","11-51","11-54","11-56","12-01","12-04","12-07","12-09","12-14","12-16","12-17","12-20","12-23","12-25","12-27","12-30","12-32","12-34","12-37","12-39","12-41","12-44","12-46","21-01","21-04","21-07","21-12","21-15","21-22","21-24","13-title","12-48","13-01","13-03","13-06","13-10","13-12","13-16","13-19","13-21","13-23","13-26","13-28","13-31","13-34","13-36","14-title","14-01","14-04","14-08","14-10","14-12","14-15","14-18","14-21","14-23","14-25","14-28","14-30","15-title","15-01","15-03","15-05","15-08","15-10","15-12","15-14","15-16","15-18","15-20","15-23","15-26","16-title","16-01","16-03","16-05","16-08","16-12","16-15","16-17","16-19","16-22","16-25","16-26","16-29","16-32","17-title","17-01","17-03","17-06","17-09","17-12","17-15","17-18","17-20","17-22","17-24","17-25","18-title","18-01","18-04","18-06","18-08","18-10","18-12","18-15","18-17","18-19","18-22","18-25","18-28","18-31","18-33","18-36","18-38","19-title","19-01","19-04","19-07","19-10","19-12","19-14","19-17","19-19","19-21","19-23","19-25","19-28","19-31","19-34","19-36","19-38","19-40","20-01","20-03","20-06","20-08","20-11","20-14","20-16","20-19","20-21","20-24","20-26","20-28","20-30","01-01","01-04","01-06","01-09","01-10","01-12","01-14","01-16","01-19","01-22","01-24","01-26","01-29","01-32","01-35","01-37","01-40","01-43","01-46","01-49","02-01","02-03","02-06","02-09","02-11","02-12","02-13","02-15","02-17","02-20","02-23","03-title","03-01"]}
\ No newline at end of file