From a493cd6f016124a308f1c1f5295e53639b304f59 Mon Sep 17 00:00:00 2001
From: "bahasatech.indotengah" <btsindonesiatengah@gmail.com>
Date: Thu, 25 May 2023 18:50:23 +0700
Subject: [PATCH] Thu May 25 2023 18:50:22 GMT+0700 (Indochina Time)

---
 01/04.txt |  6 +-----
 01/12.txt |  6 +-----
 03/06.txt |  6 +-----
 07/25.txt |  6 +-----
 07/35.txt |  6 +-----
 07/39.txt |  6 +-----
 08/07.txt |  6 +-----
 09/15.txt |  6 +-----
 10/05.txt |  6 +-----
 11/17.txt |  7 +------
 11/23.txt |  6 +-----
 11/31.txt |  6 +-----
 12/04.txt |  8 ++------
 12/12.txt |  6 +-----
 12/18.txt |  6 +-----
 12/25.txt |  6 +-----
 13/04.txt |  6 +-----
 14/10.txt |  6 +-----
 14/29.txt |  6 +-----
 14/37.txt |  6 +-----
 15/03.txt |  6 +-----
 15/18.txt |  6 +-----
 15/29.txt |  6 +-----
 16/13.txt |  6 +-----
 16/21.txt | 13 ++-----------
 25 files changed, 27 insertions(+), 133 deletions(-)

diff --git a/01/04.txt b/01/04.txt
index 55f141ad..efd22d0d 100644
--- a/01/04.txt
+++ b/01/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Nang Lahatala ganua hama ubagang tarus tarus, miama idang,sebab Lahata la ganua hama Gang mia ma maminang Yesus Kris tus  gomimi \v 5 sebab il ru pa karanu gomimi,Gang ing gene kafasa ae gomimi, mau itutuk iubagang,naga ba oli ae ipikir iganukung rupa karanu gomimi.\v 6 Emang hula Kristus gasarin ta ing anga a'e iomimi ana mang jema.
-=======
-\v 4 Nan tarima kasi ubagang tarus tarus,na Lahatala ga latutuk miama idang,sebab Lahatala ganua hama gang miama maminang YesusKri  stus  gomimi \v 5 Il karanu ka ranu gomimi,gang ing ge ne kafasa ae gomimi,mau itutuk ubagang,nagaba oli ae ipikir ganukung rupa rupa karanu gomimi. \v 6 Emang hula tatami Kris tus ganua hama anga gang ae miama iomi gomi anga mi mega jema.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 4 Nang Lahatala ganua hama ubagang tarus tarus, miama idang,sebab Lahata la ganua hama Gang mia ma maminang Yesus Kris tus  gomimi \v 5 sebab il ru pa karanu gomimi,Gang ing gene kafasa ae gomimi, mau itutuk iubagang,naga ba oli ae ipikir iganukung rupa karanu gomimi. \v 6 Emang hula Kristus gasarin ta ing anga a'e iomimi ana mang jema.
\ No newline at end of file
diff --git a/01/12.txt b/01/12.txt
index 143d7b5b..ed0bae81 100644
--- a/01/12.txt
+++ b/01/12.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Naganukung mada sebola nama ananu a'e tutuk gagiani,"Neng Paulus bagala," "Joa bola,"Neng ad i Apolos bagala,"Joa oli uba gang bola,neng adi Ke fas bagala,"Joa oli ubagang bo la,neng Kristus bagala." \v 13 Anise Kristus anga tara-tara? Paulus ba leut uhalia mia idang? Naga ing baptis  anga Paulus gene gomi?
-=======
-\v 12 Nang pikir sebola,nama ananu tutuk sebola,"Neng  adi Paulus gagoang mi," "joa oli ubagang se bola, "neng adi Apolos gagoang mi," "joa oli uba gang sebo la,neng adi Kefas gago ang mi," "Joa oli ubaang sebola, neng Kristus gomi." \v 13 Ani se Kristus anga tatara? Pau lus ba nama geng salip mia ma adang? E naga nama ji  al miama abiang tang anga Paulus gene gomi?
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 12 Naganukung mada sebola nama ananu a'e tutuk gagiani,"Neng Paulus bagala," "Joa bola,"Neng ad i Apolos bagala,"Joa oli uba gang bola,neng adi Ke fas bagala,"Joa oli ubagang bo la,neng Kristus bagala." \v 13 Anise Kristus anga tara-tara? Paulus ba leut uhalia mia idang? Naga ing baptis  anga Paulus gene gomi?
\ No newline at end of file
diff --git a/03/06.txt b/03/06.txt
index 01ac4bc8..9a9c3618 100644
--- a/03/06.txt
+++ b/03/06.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 6 Neng muding,Apolos si ram,ibase Lahatalaba gohi philing.\v 7 Jadi ka gamudi ng banaga,olika gingba sira m banaga,ibase ajimi anga Lahatala,gemba gohi philing.
-=======
-\v 6 Neng ba muding ,Apolos siram,ani ibase Lahatala ba  gohi philing. \v 7 Jadi ka gaba muding banaga,oli ka geng ba siram banaga,ibase ajimi anga Lahatala, gem ba gohi philing.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 6 Neng muding,Apolos si ram,ibase Lahatalaba gohi philing. \v 7 Jadi ka gamudi ng banaga,olika gingba sira m banaga,ibase ajimi anga Lahatala,gemba gohi philing.
\ No newline at end of file
diff --git a/07/25.txt b/07/25.txt
index 77d3776b..a90fd947 100644
--- a/07/25.txt
+++ b/07/25.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 25 Adi miama namaba nika bado anga gidang,adi ka Lahatala ba parenta ba naga.Adi nomi gagahiba nang miama iala tutuk,tata bi Lahatala gomi nua,gang neng parsaja. \v 26 Nang ganukung sebola il adi nu a oras susa garupa gagiani  gomimi,kalo aganise lebe minua nama ananu gang aphetal emang hula,aphe talba gang sementara a'e miapheal tetabanise anga ba gajoang.
-=======
-\v 25 Adi nang miama nama ba nika bado anga gonong gidang,adi ka parenta Laha tala gabung adu bana,Adi nomi gagahi ba nang mia ma iala tutuk,tatabi Lahata la gomi nua gang neng parsaja. \v 26 Nang rasa ne ning ba nang ubagang adi nua,miama oras phela go mi adimi,penangba lebe mi nua nama ananu aphetal e mang hula,aphetal ba gang mi apheal adi gajoang.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 25 Adi miama namaba nika bado anga gidang,adi ka Lahatala ba parenta ba naga.Adi nomi gagahiba nang miama iala tutuk,tata bi Lahatala gomi nua,gang neng parsaja. \v 26 Nang ganukung sebola il adi nu a oras susa garupa gagiani  gomimi,kalo aganise lebe minua nama ananu gang aphetal emang hula,aphe talba gang sementara a'e miapheal tetabanise anga ba gajoang.
\ No newline at end of file
diff --git a/07/35.txt b/07/35.txt
index c612eaff..3864d810 100644
--- a/07/35.txt
+++ b/07/35.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 35 Nang il adi ubagang miama inua gene,kabohula miama kuphat fal gene mia ma idang banaga,anghise balenta  ba ing galalamal miama Lahatala gadang  anga gasasakang ka ubana ga.
-=======
-\v 35 Nang il adi ubang mia ma inua gene,kabo hula mi ama kuphat fal gene mia ma adang banaga,anghi pe layanan ba ing galalamal miama Lahatala gadang  ang ga sakang u banaga.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 35 Nang il adi ubagang miama inua gene,kabohula miama kuphat fal gene mia ma idang banaga,anghise balenta  ba ing galalamal miama Lahatala gadang  anga gasasakang ka ubana ga.
\ No newline at end of file
diff --git a/07/39.txt b/07/39.txt
index 80768ae5..ef98a8f1 100644
--- a/07/39.txt
+++ b/07/39.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 39 Nama hial ka lohi ba naga kalo ganaming do a'e aphetal jia,ani ibase kalo  ganaming amina jema ga ng lohi nama gala nika, ga ng kalo bola nama joa suka asal nama anga Lahatala gomimi aphetal.\v 40 Ani ibase naganukung gang le be misanang,kalo gang ap hetal garupa agani,oli nang gelisebola Lahatala ga Ea ng anga gie nabung.
-=======
-\v 39 Nama hial kabebas banaga ganaming do aphe tal jia,ani ibase kalo gana  ming amina jema anga se gang bebas nama gala nika, gang kalo nama joa  suka, asal nama anga gang Lahatala gomimi aphetal. \v 40 Ani ibase menurut neng gang lebe sanang,kalo gang tatap aphetal ani,oli naang gelisebola Lahatala ga Roh gie nabung.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 39 Nama hial ka lohi ba naga kalo ganaming do a'e aphetal jia,ani ibase kalo  ganaming amina jema ga ng lohi nama gala nika, ga ng kalo bola nama joa suka asal nama anga Lahatala gomimi aphetal. \v 40 Ani ibase naganukung gang le be misanang,kalo gang ap hetal garupa agani,oli nang gelisebola Lahatala ga Ea ng anga gie nabung.
\ No newline at end of file
diff --git a/08/07.txt b/08/07.txt
index 0503012b..703a36ad 100644
--- a/08/07.txt
+++ b/08/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 7 Masiking agani,ibase manusia ajimi gi ganukung garupa gagiani.Ani ibase gi nang adedeng amba ging biasa te'fal'gahi aduma adi ujia.Ging mud phana miam a te'fal' gahi sengse gamud anga ging oli kede,anga ge lang gi ganukung ba giomi giomimi mada agani anga moleng, anga gelang ging karita.
-=======
-\v 7 Masiking ani,ibase manu sia ajimi gi ganukung garu pa gagiani.Ani ibase gi nang adedeng ging biasa te'fal'gahi,ma adi ujia.Ging mud phana miama te'fal' gahi seng se gamud anga ging oli kede, anga gelang gipikir ganukung ba giomi gomi mi mada moleng anga gelang ging karita.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 7 Masiking agani,ibase manusia ajimi gi ganukung garupa gagiani.Ani ibase gi nang adedeng amba ging biasa te'fal'gahi aduma adi ujia.Ging mud phana miam a te'fal' gahi sengse gamud anga ging oli kede,anga ge lang gi ganukung ba giomi giomimi mada agani anga moleng, anga gelang ging karita.
\ No newline at end of file
diff --git a/09/15.txt b/09/15.txt
index d454ec70..441ce7a6 100644
--- a/09/15.txt
+++ b/09/15.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 15 Gafiag anga ani,ibase nangka hingkul edeng di ukarajang gafiag ugaluali banaga.Nangka il adi tulis miama idang banaga,ang hise iohi ukarajang miama nadang gnang.Lebe minua nang amina dari pada na ma nasuka nafera adi gene gang ae banaga.\v Sebab nang Injil ututuk ka bohula miama nafak phahi tajanin g banaga,ibase anga mia nakarajang gafagi.Silaka miama nadang kalo nang ka Injil adi ututuk banaga.
-=======
-\v 15 Masiking il fiag ani, ibas se nang ka perna anu anga hingkul edeng di ukara jang banaga. Nang oli il adi tulis mega miama maminang ka bohula iohi ukara jang miama na dang banaga \v 16 Sebab Injil ba nang ututuk ubagang adi ka mima ala san anu gafagi nama nafak pahi adi tajaning banaga, sebab adi ba nakarajang. Silaka miama nadang kalo nang ka injil adi ututuk banaga.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 16 \v 15 Gafiag anga ani,ibase nangka hingkul edeng di ukarajang gafiag ugaluali banaga.Nangka il adi tulis miama idang banaga,ang hise iohi ukarajang miama nadang gnang.Lebe minua nang amina dari pada na ma nasuka nafera adi gene gang ae banaga.\v Sebab nang Injil ututuk ka bohula miama nafak phahi tajanin g banaga,ibase anga mia nakarajang gafagi.Silaka miama nadang kalo nang ka Injil adi ututuk banaga.
\ No newline at end of file
diff --git a/10/05.txt b/10/05.txt
index a8d9eec9..0f1f57b4 100644
--- a/10/05.txt
+++ b/10/05.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 5 Masiking agani,ibase Lahatala ginang tohing gi ng suka banaga.Anga gela ng ginang tohingrai belan tara gomi giene tamina.\v 6  Ilba gasuang agani anga miama u pitubing, anga hi se ping ake phela gahalang piomi miama mirafak jia ga nang,oli ake a'e ping u ga nang emanghula ging uka rajang anga gajoang.
-=======
-\v 5 Masiking ani,ibase Lahatala ginan utohing ging suka ba naga. Anga gelang gang ginang utohing rai belatara gomi giene tamina. \v 6 Keadaan ba garupa agani anga miama u pitubing,anga hi se,piomi ake phela gaha lang mirafak jia ( rakus ) anga ake ae ping u ganang emanghula ging ukarajang anga gajoang.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 5 Masiking agani,ibase Lahatala ginang tohing gi ng suka banaga.Anga gela ng ginang tohingrai belan tara gomi giene tamina. \v 6 Ilba gasuang agani anga miama u pitubing, anga hi se ping ake phela gahalang piomi miama mirafak jia ga nang,oli ake a'e ping u ga nang emanghula ging uka rajang anga gajoang.
\ No newline at end of file
diff --git a/11/17.txt b/11/17.txt
index b95c11e6..3c6da1d1 100644
--- a/11/17.txt
+++ b/11/17.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 17  Nang parenta miama maminang,nangka ing taja ning banaga,tami ing teng kumpul bohula miama il  nua gadang banaga ibase miama il phera ba gadang.\v 18 Gahalomang ing toku mpul miama jemat gene, nang umagia sebohula iha hama mi anga tomianu ka ae banaga,ani ibase ing joa anga,nang ing persaja.
-\v 19 Oli malekang pikirang tatara anga ae ihahamami, angahise ping bisa tahang   udagili anga uling geli.
-=======
-\v 17 Adi nang parenta mia ma maminang,nang ing ta janing karna ing teng kum pul,ka bohula miama il ba lebe minua gadang bana ga ibase miama il phera ba gadang. \v 18 Gahalomang ing tokumpul miama jemat gene, nang umagia sebohu la ihahama mi anga tomia nu ae banaga,ani ibase ing joa anga, nang ing percaya. \v 19 Oli malekang pikirang ta tara anga ae ihahamami, angahise ping bisa tahang   udagili anga uling geli.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 17 Nang parenta miama maminang,nangka ing taja ning banaga,tami ing teng kumpul bohula miama il  nua gadang banaga ibase miama il phera ba gadang. \v 18 Gahalomang ing toku mpul miama jemat gene, nang umagia sebohula iha hama mi anga tomianu ka ae banaga,ani ibase ing joa anga,nang ing persaja. \v 19 Oli malekang pikirang tatara anga ae ihahamami, angahise ping bisa tahang   udagili anga uling geli.
\ No newline at end of file
diff --git a/11/23.txt b/11/23.txt
index 6d2454c9..ebbb7bf8 100644
--- a/11/23.txt
+++ b/11/23.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 23 Il adi,nang Lahatala ga bung tarima, adiba nan g miama maminang, tami Tuhan Yesus il kakua gomi, nama Geng gene susa,Gan g angmi roti anu mia \v 24 sengmuse Gang sambaja ng,roti anga gakahi kakiri, sengmuse Gang ubagang sebola,"Adiba naboga,mia ma idang; ukarajang mia ma u'ieling gene,miama nadang iaphetal gomimi.
-=======
-\v 23 Adi,nang Lahatala ga bung tarima, adiba nang miama maminang,waktu Tuhan Yesus il kakua gomi, nana geng gene susa,gang angmi roti anu mia \v 24 seng sengmuse gang samba   jang gang roti anga gakahi kakiri,sengmu se gang uba gang sebola, "Adiba nabo ga aji miama idang,ukara jang miama u'ieling miama nadang iaphetal gomi.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 23 Il adi,nang Lahatala ga bung tarima, adiba nan g miama maminang, tami Tuhan Yesus il kakua gomi, nama Geng gene susa,Gan g angmi roti anu mia \v 24 sengmuse Gang sambaja ng,roti anga gakahi kakiri, sengmuse Gang ubagang sebola,"Adiba naboga,mia ma idang; ukarajang mia ma u'ieling gene,miama nadang iaphetal gomimi.
\ No newline at end of file
diff --git a/11/31.txt b/11/31.txt
index 2e223ce5..6e56a34a 100644
--- a/11/31.txt
+++ b/11/31.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 31 Ani ibase ping pidiri adi parisa bohula ping mo lo, angse Gangka ping hu kung banaga.\v 32 Ani iba se Gang ping hukung, oli ping ajar,bohula piohi ake dunia gala topuni fa huku ng anga harak ganang.
-=======
-\v 31 Ani ibase ping pi diri adi parisa bohula ping molo, angse gangka ping hukung banaga. \v 32 Ani ibase gang ping hukung,gang ping a jar,bohula piohi ake dunia gala fa hukung anga dapa ganang.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 31 Ani ibase ping pidiri adi parisa bohula ping mo lo, angse Gangka ping hu kung banaga. \v 32 Ani iba se Gang ping hukung, oli ping ajar,bohula piohi ake dunia gala topuni fa huku ng anga harak ganang.
\ No newline at end of file
diff --git a/12/04.txt b/12/04.txt
index d51f161b..de3b34ed 100644
--- a/12/04.txt
+++ b/12/04.txt
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-\v 4 Karunia anga mang to hing rai ba'ae mia piual ma gang gadang,ibase Eang Hamolang anu oli hama.\v 5 Oli balenta fala tohing rai ibase Lahatala anu. \v 6 Oli karajang anga rupa rupa, ibase Lahatala anu ang ba manusia ajimi gomimi kara
-jang.
-=======
-\v 4 Nuahama tohing rai piul magang geg ae, ibase Roh anga anu oli hama \v 5 Oli na ma balenta anga mang to hing rai,ibase Lahatala anu \v 6 Tatabi karajang rupa-rupa, ibase Lahatala anu anga ba manusia ajimi gomimi miha karajang
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 4 Karunia anga mang to hing rai ba'ae mia piual ma gang gadang,ibase Eang Hamolang anu oli hama. \v 5 Oli balenta fala tohing rai ibase Lahatala anu. \v 6 Oli karajang anga rupa rupa, ibase Lahatala anu ang ba manusia ajimi gomimi kara
+jang.
\ No newline at end of file
diff --git a/12/12.txt b/12/12.txt
index 79a3dea8..0b2faec7 100644
--- a/12/12.txt
+++ b/12/12.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 12 Emang hula piboga aji jadi anu,ibase gail phohi ng tohing,ibase ajimi  anga piboga aji gail phohing, Masiking tohing, ibase jadi anu phenangba piboga aji. Ani dise Kristus.\v 13 Sebab Eang anu gomimi nama jial miama pibiang tang pibo ga anu gomimi, mau Yahu di,nagaba Yunani mau na ma gamalal,nagaba nama lohi, pinang ajimi Eang anu gomimi Gang mia ping na .
-=======
-\v 12 Emang hula piboga aji jadi anu,ani ibase gail pho hing tohing,ibase aji mi  anga pi boga aji gail pho hing,Masiking tohing, ibase jadi anu phenang ba pibo ga aji.Ani dise Kristus. \v 13 Sebab roh anu gomimi na ma jial miama pibiang tang piboga anu gomimi, mau Yahudi,nagaba Yunani mau nama gamalal,nagaba na ma lohi, pi nang ajimi  roh anu gomimi ping tarima .
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 12 Emang hula piboga aji jadi anu,ibase gail phohi ng tohing,ibase ajimi  anga piboga aji gail phohing, Masiking tohing, ibase jadi anu phenangba piboga aji. Ani dise Kristus. \v 13 Sebab Eang anu gomimi nama jial miama pibiang tang pibo ga anu gomimi, mau Yahu di,nagaba Yunani mau na ma gamalal,nagaba nama lohi, pinang ajimi Eang anu gomimi Gang mia ping na .
\ No newline at end of file
diff --git a/12/18.txt b/12/18.txt
index f5e397b3..e294f469 100644
--- a/12/18.txt
+++ b/12/18.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 18 Ani ibase Lahatala pi boga aji gail phohing anga ajimi miama nama ananu gaboga aji gemana anga mimega,gamau gau jali  anga ugaluali.\v 19 Kalo aji mi anga il phohing garupa anukelang,angase piboga aji adi ae tami? \v  20 Jadi tatabi piboga aji gail pho hing tohing,ibase piboga adi anu kakelang.
-=======
-\v 18 Ani ibase Lahatala pibo ga aji gail phohing anga aji mi miama nama ananu ga bo ga ajimi gemana anga mimega,gamau gau jali  anga ugaluali. \v 19 Kalo ajimi anga il phohing garupa  anu kelang,angase piboga aji adi ae tatami? \v 20 Jadi tatabi piboga aji gail pho hing tohing,ibase piboga adi anu kakelang.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 18 Ani ibase Lahatala pi boga aji gail phohing anga ajimi miama nama ananu gaboga aji gemana anga mimega,gamau gau jali  anga ugaluali. \v 19 Kalo aji mi anga il phohing garupa anukelang,angase piboga aji adi ae tami? \v 20 Jadi tatabi piboga aji gail pho hing tohing,ibase piboga adi anu kakelang.
\ No newline at end of file
diff --git a/12/25.txt b/12/25.txt
index 07ae8d15..f4389484 100644
--- a/12/25.txt
+++ b/12/25.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 25  Ani anghise,ping ake mitatara tegapalang anga ae piboga gomimi ganang, anga hise gail phohing ang a gonong ging tauling mia ma tatadang. \v 26 Kalo il phong anu keta,angase il phiohing gaebeng anga di ajimi keta hamajia.Oli ilpho hing anu nama geng taja ning angase il phohig ga ebeng angadi suka nafera. \v 27 Ping adiba Yesus ga boga'aji,oli pinang ajimi-aji mi adiba oli giaka gatang.
-=======
-\v 25 Ani ang hise,ping ake mitatara tegapalang anga ae piboga g mimi ganang, anga hise gail phong anga gonong ging tata tata uling miama tatadang. \v 26 Kalo il phong anu keta anga se il phiohing gaebeng anga di ajimi keta hamajia.Oli ilpho hing anu nama geng taja ning angase il phohig ga ebeng angadi suka navera. \v 27 Ping adiba Yesus gabo ga aji,oli pinang ajimi ajimi adiba oli giaka gatang
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 25 Ani anghise,ping ake mitatara tegapalang anga ae piboga gomimi ganang, anga hise gail phohing ang a gonong ging tauling mia ma tatadang. \v 26 Kalo il phong anu keta,angase il phiohing gaebeng anga di ajimi keta hamajia.Oli ilpho hing anu nama geng taja ning angase il phohig ga ebeng angadi suka nafera. \v 27 Ping adiba Yesus ga boga'aji,oli pinang ajimi-aji mi adiba oli giaka gatang.
\ No newline at end of file
diff --git a/13/04.txt b/13/04.txt
index 72af34c1..e1052f51 100644
--- a/13/04.txt
+++ b/13/04.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 4 Tomi tajajahi garupa anga sabar,gatang bala suka il paul,tomi tajahi ang aka nama geng curiga ba naga,olika sombong bana ga,\v 5 ka sambarang bana ga,ka gadiri galokang upiki r banaga,ka suka gomi ka lila banaga,ka nama gaga halang taganang banaga.\v  6 Il-il gahala,gene gangka sanang banaga, ani ibase gang rasa sanang kalo na ma nuahama angaba uka rajang.\v 7 Tomi tajajahi anga tahang udagili,il rupa karanu gomimi,gami kaku bal anu ae,gang oli tahang udagili il rupa karanu gomi mi adu.
-=======
-\v 4 Tomi tajajahi anga sabar, suka il mia nama upaul,to mi tajahi anga ka nama geng curiga banaga,ka oli sombong banqga, \v 5 ka sambarang banaga,ka ga diri galo kang upikir ba naga,ka saka li gomi kalila banaga, kana ma gagaha lang taganang banaga. \v 6 Nama gahalang gene se gang ka sanang banaga, ani ibase gang rasa sanang kalo nama nua hama anga ukarajang. \v 7 Tomi tajajahi anga tahan udagili rupa ka ranu gomimi adu.gang oli tatabi persaja rupa karanu gomimi adu.il karanu anga gang harap,gang tahang sabar rupa karanu gomimi adu.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 4 Tomi tajajahi garupa anga sabar,gatang bala suka il paul,tomi tajahi ang aka nama geng curiga ba naga,olika sombong bana ga, \v 5 ka sambarang bana ga,ka gadiri galokang upiki r banaga,ka suka gomi ka lila banaga,ka nama gaga halang taganang banaga. \v 6 Il-il gahala,gene gangka sanang banaga, ani ibase gang rasa sanang kalo na ma nuahama angaba uka rajang. \v 7 Tomi tajajahi anga tahang udagili,il rupa karanu gomimi,gami kaku bal anu ae,gang oli tahang udagili il rupa karanu gomi mi adu.
\ No newline at end of file
diff --git a/14/10.txt b/14/10.txt
index a801d3a0..40ead76e 100644
--- a/14/10.txt
+++ b/14/10.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 10 Hur tohingrai gie du nia tang adi,anu kakelang di gagunang u,\v 11 Ani iba se hur anga ping mangga rati bana,angase neng adi narupa nama gengaji molo nama tutuk jia anga gihaha mami,oli namaba tutuk jia anga geng miama nama ebeng gene a'e pihahama mi.
-=======
-\v 10 Hur talalu tohing rai gie dunia tang oli anu kake lang di bola gagunang ka ubanaga anga naga, \v 11 Ani ibase ibase ping kalu hur anga manggarati banaga anga se neng adi miama nama geng aji molo nama ba tutuk jia gihahama mi oli nama batutuk jia anga miama pi nama ebeng gene,pihahama mi.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 10 Hur tohingrai gie du nia tang adi,anu kakelang di gagunang u, \v 11 Ani iba se hur anga ping mangga rati bana,angase neng adi narupa nama gengaji molo nama tutuk jia anga gihaha mami,oli namaba tutuk jia anga geng miama nama ebeng gene a'e pihahama mi.
\ No newline at end of file
diff --git a/14/29.txt b/14/29.txt
index 1b7363a5..2b3a87f1 100644
--- a/14/29.txt
+++ b/14/29.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 29 Biarla nabi alo nagase atoga kelang tutuk sengse ging ebeng anga miha uga nukung.\v 30 Ani ibase kalo il ba nama matubing anga miama nama ebeng ae ang ami miha anga gidang,ang se nama gahalomang anga takimang
-=======
-\v 29 Biarla nabi alo nagase atoga kelang tutuk sengse ging ebeng anga miha u kur. \v 30 Ani ibase kalo il ba nama matubing anga mia ma nama ebeng ae angami miha anga gidang,angse takimang
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 29 Biarla nabi alo nagase atoga kelang tutuk sengse ging ebeng anga miha uga nukung. \v 30 Ani ibase kalo il ba nama matubing anga miama nama ebeng ae ang ami miha anga gidang,ang se nama gahalomang anga takimang
\ No newline at end of file
diff --git a/14/37.txt b/14/37.txt
index 4b364ce3..e0a179ee 100644
--- a/14/37.txt
+++ b/14/37.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 37 Kalo nama joa ae upi kir sebohula geng nabi nagaba nama parsaja biar la ilba nang tulis adi gang  uling geli sebohula,nening ba nang hula miama mega adi gonong Lahatala ga parenta \v 38 Ging kalo il adika geli banaga angase namaka gieli banaga.
-=======
-\v 37 Kalo nama joa ae upikir sebohula ging nabi nagaba nama parsaja biar la gang gang gafak phahi anga uli ng gelai sebohula,ne ning ba nang tulis miama mega adi gonong Lahatala ga parenta \v 38 Nama joa kalo il adi ka geli banaga angase nama ka geli banaga
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 37 Kalo nama joa ae upi kir sebohula geng nabi nagaba nama parsaja biar la ilba nang tulis adi gang  uling geli sebohula,nening ba nang hula miama mega adi gonong Lahatala ga parenta \v 38 Ging kalo il adika geli banaga angase namaka gieli banaga.
\ No newline at end of file
diff --git a/15/03.txt b/15/03.txt
index 71849fee..a4d6d64a 100644
--- a/15/03.txt
+++ b/15/03.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 3 Nang miama iala tutuk jema, gapentingba nang ha lomang tarima phenangba, Kristus amina anga pi dosa gelang,tatami ae tulis surat hamolang gomimi anga  molo.\v 4 Nama gapotung jema,ibase Gang oli bale aphetal fid atoga gomi,su rat hamolang gamang ang a ugaluali.
-=======
-\v 3 Nang miama iala tutuk jema ga halomang- halo mang nang tarima penang ba, Kristus amina anga kar na pidosa gelang, tatami ae tulis surat hamolang gomi anga molo. \v 4 Nama gapo tung jema, gang oli bale aphetal fid atoga gomi, surat hamolang gamang anga ugaluali.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 3 Nang miama iala tutuk jema, gapentingba nang ha lomang tarima phenangba, Kristus amina anga pi dosa gelang,tatami ae tulis surat hamolang gomimi anga  molo. \v 4 Nama gapotung jema,ibase Gang oli bale aphetal fid atoga gomi,su rat hamolang gamang ang a ugaluali.
\ No newline at end of file
diff --git a/15/18.txt b/15/18.txt
index 568acbe3..9924e222 100644
--- a/15/18.txt
+++ b/15/18.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 18 Agani dise gingba  amina Kristus gomimi jema ging ka salamat banaga.\v 19 Kalo pimikuat Kristus gomimi adi pingdo miama aphetal jia adiba galokang mimega,angase ping adiba nama miphela gie dunia tang adimi.
-=======
-\v 18 gani dise ba gingba ging ba amina Kristus gomimi, ging ka salamat banaga. \v 19 Kalo ping pikir sebola ping do aphetal jia adi ba Kristus gang piala topuni, ping amina jema se naga, angse ping adiba namaba miphela gie dunia tang
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 18 Agani dise gingba  amina Kristus gomimi jema ging ka salamat banaga. \v 19 Kalo pimikuat Kristus gomimi adi pingdo miama aphetal jia adiba galokang mimega,angase ping adiba nama miphela gie dunia tang adimi.
\ No newline at end of file
diff --git a/15/29.txt b/15/29.txt
index 8141bbc7..c2552a6f 100644
--- a/15/29.txt
+++ b/15/29.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 29 Kalo ani banagase,ne ningba ging oli ukarajang, babtis miama nama amina jema gadang? Kalo nama amina ka bale aphetal ba nagase,geta baniba jial miama nama gibi ang tang?\v 30 Oli getabani ba ning adi aphetal susalala gomimi uras kakanap ?
-=======
-\v 29 Kalo ani banagase, nening ba ging ukarajang  jial mia ma namaba amina jema gadang? Kalo nama amina ka bale aphetal ba nagase,getabani ba nama jial miama gibiang tang? \v 30 Oli getabani ba ning adi susa lala gomimi fid kaka nap?
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 29 Kalo ani banagase,ne ningba ging oli ukarajang, babtis miama nama amina jema gadang? Kalo nama amina ka bale aphetal ba nagase,geta baniba jial miama nama gibi ang tang? \v 30 Oli getabani ba ning adi aphetal susalala gomimi uras kakanap ?
\ No newline at end of file
diff --git a/16/13.txt b/16/13.txt
index 79877ad9..80d78c1f 100644
--- a/16/13.txt
+++ b/16/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 13 Yafak anga ujaga,i'Im an gomi mate anamang.Ta dili betul garupa nama am u molo, sengse oli kuat. \v 14 Il rupa karanuba ing uka rajang gomimi anga,ing  malekang tomi tajajahi gomi
-=======
-\v 13 Yafak anga ujaga,I iman gomi mate anamang, tadili betul emanghula nama amu anu molo,sengse oli kuat. \v 14 Rupa karanu ba ing ukarajang,karajang go mi iomi miama tajajahi.
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+\v 13 Yafak anga ujaga,i'Im an gomi mate anamang.Ta dili betul garupa nama am u molo, sengse oli kuat. \v 14 Il rupa karanuba ing uka rajang gomimi anga,ing  malekang tomi tajajahi gomi
\ No newline at end of file
diff --git a/16/21.txt b/16/21.txt
index 1c97ad4c..21420ab6 100644
--- a/16/21.txt
+++ b/16/21.txt
@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-\v 21 Neng ba Paulus nang natangba miama il adi tulis 
-\v 22 Kalo nama joa gang ka Yesus anga gomi miama gajahi banaga,angase ku tuk miama gadang.
+\v 21 Neng ba Paulus nang natangba miama il adi tulis \v 22 Kalo nama joa gang ka Yesus anga gomi miama gajahi banaga,angase ku tuk miama gadang.
 
-Oh Tuhan Yesus,aduma!
-
-\v 23 Tuhan Yesus ganua hama iala topuni.
-
-\v 24 Nomi miama tajajahi adi,inang ajimi ialah topuni Yesus Kristus gomimi Tatabi.
-=======
-\v 21 Neng ba Paulus nang natang ba miama il tulis \v 22 Kalo nama joa gang ka Yesus anga gomi miama gajahi banaga angase ku tuk miama gadang. Oh Yesus, adu e ma! \v 23 Tuhan Yesus ganua hama iala topuni. \v 24 Nomi miama tajajahi adi tetap inang ajimi ialah topuni Yesus Kristus  gomimi, Amin
->>>>>>> 254ef5e6b4b274a0e1d6c42161399d18d6b763be
+Oh Tuhan Yesus,aduma! \v 23 Tuhan Yesus ganua hama iala topuni. \v 24 Nomi miama tajajahi adi,inang ajimi ialah topuni Yesus Kristus gomimi Tatabi.
\ No newline at end of file