Wed Apr 03 2024 17:31:54 GMT+0900 (Japan Standard Time)

01/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 1 Upmmaski Naimap Weime Houm Bep Amroh
-\p \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre.Om maam,waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy.
+\p \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre.Om maam,waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy.
+=======
+\c 1 (Upmmaski Naimap Weime Houm Bep Amroh) \v 1 Amar waam yap om raan,Raam om waspahgi Om Ar ahpis pem raam om Aar. \v 2 Ram om weimeki waspahgi om Ar ahpis om omor waam yapki. \v 3 Waspagi yasap-yasap akin baitn arkujm om omre.Om maam,waspahgi yasap-yasap akin om weimeki am raam om ine pahmakin om raapy.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/16.txt

@@ -1,3 +1,7 @@
 \v 16 Om amar kepenuhan enemri,dep waspahgi hepen kumni ohoiyare matam pemki pemro. \v 17 Pe Hukum Taurat om har penkum Musa ahrki;pe anugrah pem yeraraam yap om houm Yeisi Kristus ahrki. \v 18 Ini yanap pahmakin sahpy Ar Ahin,pe raapAr Ahm,om woii pengakuan Aii ahmro,fohmum omre.
+<<<<<<< HEAD
 \p
- Roh Boup Yohanes Pembabtis Ahm
+ Roh Boup Yohanes Pembabtis Ahm
+=======
+(Roh Boup Yohanes Pembabtis Ahm)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/24.txt

@@ -1 +1,5 @@
-\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro, pe ah ine au Mesias, ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon?
+<<<<<<< HEAD
+\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro, pe ah ine au Mesias, ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon?
+=======
+\v 24 Yanap Yahudi yap omfe waski kaumairenki om omor Farisi yanap. \v 25 Omki enere fenkum om Yohanes ahro,pe ah ine au Mesias,ine au Elia,pem om ine au nabi om,bekem fakin ah babtis yab arkenon?
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/26.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 26 Yohanes fohmum enero, dahre yap arkefop babtis ohomki, pe ahan omro pahmakin ekamahnro pahmakin om ine sahpe. \v 27 Omro om houfeitn, dahki om weiki.Feifi rom sendal enemrohm dah ine itnepki. \v 28 Waspahgi om farufeitn woi Betaniaro, omor weraupam buru Yordan omoro,mimi ahm Yohanes pembabtis omro.
 \p
-Raap Domba Ar Ahm
+Raap Domba Ar Ahm
+=======
+\v 26 Yohanes fohmum enero,dahre yap arkefop babtis ohomki,pe ahan omro pahmakin ekamahnro pahmakin om ine sahpe. \v 27 Omro om houfeitn,dahki om weiki.Feifi rom sendal enemrohm dah ine itnepki. \v 28 Waspahgi om farufeitn woi Betaniaro,omor weraupam buru Yordan omoro,mimi ahm Yohanes pembabtis omro.
+(Raap Domba Ar Ahm)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/29.txt

@@ -1 +1,5 @@
-\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om, omki dahre fep, omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om, pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki."
+<<<<<<< HEAD
+\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om, omki dahre fep, omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om, pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki."
+=======
+\v 29 suprahm taam om,Yohanes sahpy Yeisi ahin semhoum omoro omki fohmum Yohanes ahre.Sahiyam raap Domba Ar Ahm.Omre ririfaitn yahpsane beb am. \v 30 Omor om dahre fohm arap om,omki dahre fep,omki om dah semhoupfop yanap-yanap akin om trimofu ah iki omor om weimki yuproh dah maamki. \v 31 Weimeki,dah sapae ine om,pe omki omor om fare fakin om Israel yanap om.Omki dah haoup yap arufop babtisan ohmki."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/32.txt

@@ -1 +1,5 @@
-\v 32 Pem Yohanes farfur, rohenem, dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om, pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm.
+<<<<<<< HEAD
+\v 32 Pem Yohanes farfur, rohenem, dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om, pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm.
+=======
+\v 32 Pem Yohanes farfur,rohenem,dahre sahrap roh om suruepe wapki eimohm kapki omor merpati spam omor paski pemroh om mimi omro. \v 33 Dah ohona sahpae ine om,pe omfe om dah kahumari nim om babtis fakir ohomki fahare Ahanro,omre om wapina rohom ahan sahpae suru epe Roh Kudus omki mimi.Omor omre yaparufeitn bantisan Roh Kudus ki.' \v 34 Dahare ohona sahpop pem harpahepop kesaksian om omor am raap Ar Ahm.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/37.txt

@@ -1 +1,5 @@
-\v 37 Tuski murid enem, yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro, Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn, om fakir mimi pem en mimi waspahgi ram taam om, omor taam om enem amar ampaski taam kesepuluh.
+<<<<<<< HEAD
+\v 37 Tuski murid enem, yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro, Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn, om fakir mimi pem en mimi waspahgi ram taam om, omor taam om enem amar ampaski taam kesepuluh.
+=======
+\v 37 Tuski murid enem,yiriaim roh boup enem,om omki ipopki Yeisi ahro. \v 38 Yeisi sahm eina remtemum aparupo omki sahpum eneroh en ipopki omore,omki fohmum enero,bekeme om ahan haah?Enere fenkum omoro,Rabi(Guru)tamroh in ahh mimi? \v 39 Om fohmum enro,eisepm omki ahn sahpayafiren."Wonaki omki en honpiren pem sahyafeitn,om fakir mimi pem en mimi waspahgi ram taam om,omor taam om enem amar ampaski taam kesepuluh.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/40.txt

@@ -1 +1,5 @@
-\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas, yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon, pem yunim enem, pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am, Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro, Yeisi sahpum Simon ain pem omki fohmum, ahain Simon raap Yohanes ahn. Ahan waski foiyaifeitn Kefasahre (Om omor Petrus ahain pem Batu)"
+<<<<<<< HEAD
+\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas, yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon, pem yunim enem, pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am, Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro, Yeisi sahpum Simon ain pem omki fohmum, ahain Simon raap Yohanes ahn. Ahan waski foiyaifeitn Kefasahre (Om omor Petrus ahain pem Batu)"
+=======
+\v 40 Pahmo nim yirahpsepe yoo tuski omkayap yirari roh moup Yohanes ahn omki ipopki Yeisi ahro.Om omor Andreas,yunim Simon Petrus ahn. \v 41 Tenaski Andreas tupsatne Simon,pem yunim enem,pem fohr pakum ahan om waski foyapafirem,dep weime yahiamop Mesias om(Waski pahpriam non ne am,Kristus) \v 42 Wonahki Andreas yahpsepy Simon ain omor Yeisi ahro,Yeisi sahpum Simon ain pem omki fohmum,ahain Simon raap Yohanes ahn.Ahan waski foiyaifeitn Kefasahre(Om omor Petrus ahain pem Batu)"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/43.txt

@@ -1 +1,5 @@
-\v 43 Suprohm taampaski om, Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin, pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis, omki fohmu omoro deptubmsaiamop om, waski terereyap om, mesahre waina Hukum Taurat ro,pem omot nabi re, yah omor Yeisi am Nasaret, raap Yusupam."
+<<<<<<< HEAD
+\v 43 Suprohm taampaski om, Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin, pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis, omki fohmu omoro deptubmsaiamop om, waski terereyap om, mesahre waina Hukum Taurat ro,pem omot nabi re, yah omor Yeisi am Nasaret, raap Yusupam."
+=======
+\v 43 Suprohm taampaski om,Yeisi hamtarimum manipaski woi Galilearo,om fupsahpum Pilipus ahin,pem fohmum enero yirahsepe dahro." \v 44 Pilipus om woi Betsaida yap,yapu mimiahm Andreas Petrus mimi yap enkem. \v 45 Pilipus tubsapum om Natanael ahpis,omki fohmu omoro deptubmsaiamop om,waski terereyap om,mesahre waina Hukum Taurat ro,pem omot nabi re,yah omor Yeisi am Nasaret,raap Yusupam."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/46.txt

@@ -1 +1,5 @@
-\v 46 Natanael fohmum enero, tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero, hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael, fakir seiyaam pahmo nim Israel sejati one konaesahm, weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki, dah weime sahpuni ahan, omfe ahan ropenkim om yeniem wan konam Ara omro.
+<<<<<<< HEAD
+\v 46 Natanael fohmum enero, tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero, hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael, fakir seiyaam pahmo nim Israel sejati one konaesahm, weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki, dah weime sahpuni ahan, omfe ahan ropenkim om yeniem wan konam Ara omro.
+=======
+\v 46 Natanael fohmum enero,tamsekim om yasap om naimap haufeitn wo Nasaret kgi?"Filipus fohmum enero,hoore pem omki sahaiyaam." \v 47 Yeisi sahpum Natanael houm omoro,omor farufur Natanael,fakir seiyaam pahmo nim Israel sejati one konaesahm,weiniekap omoro. \v 48 Natanael fohmum,Taamsekim aah sahpakim dahro?Yeisi fohmum weimeki Pilipus foyape maamki,dah weime sahpuni ahan,omfe ahan ropenkim om yeniem wan konam Ara omro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

01/49.txt

@@ -1 +1,5 @@
-\v 49 Fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja, Israel yanpohm." \v 50 Yeisi fohmum, oem roh enem ene rohm,Amr dah fepam, ahanrohm, dah weime sahpop woom ara konomro ropokin, omki ahan yisrahsepy? Ahan ekaman sahpafiren, yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn, Yeraram yap om dahre feifep Ahan ro, Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm, wapina yaina melayani raap pahmo."
+<<<<<<< HEAD
+\v 49 Fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja, Israel yanpohm." \v 50 Yeisi fohmum, oem roh enem ene rohm,Amr dah fepam, ahanrohm, dah weime sahpop woom ara konomro ropokin, omki ahan yisrahsepy? Ahan ekaman sahpafiren, yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn, Yeraram yap om dahre feifep Ahan ro, Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm, wapina yaina melayani raap pahmo."
+=======
+\v 49 fohmum Natanael,"Rabi,Ah Amar raap ArAhm.Ah Amar Raja,Israel yanpohm." \v 50 Yeisi fohmum,oem roh enem ene rohm,Amr dah fepam,ahanrohm,dah weime sahpop woom ara konomro ropokin,omki ahan yisrahsepy?Ahan ekaman sahpafiren,yasap-yasap om wouru tiri mapu tanam ampaski ine. \v 51 Omki om farsoufeitn,Yeraram yap om dahre feifep Ahan ro,Ahan ekamahn sahiyafiren eimohm tar hoseyap pem malaikat-malaikat Ar Ahm,wapina yaina melayani raap pahmo."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/01.txt

@@ -1 +1,5 @@
-\c 2 \v 1 Omki taam wadnikesi roki, yapu kana omoro nim doo hape farkum, yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro.
+<<<<<<< HEAD
+\c 2 \v 1 Omki taam wadnikesi roki, yapu kana omoro nim doo hape farkum, yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro.
+=======
+\c 2 \v 1 Omki taam wadnikesi roki,yapu kana omoro nim doo hape farkum,yame omki pem yapu Galilea omki Yeisi pem enou omoro ropokim. \v 2 Yeisi pem yoyim enem waspahgi foyapenkum doo hepe yame omoro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/09.txt

@@ -1 +1,5 @@
-\v 9 Omki yame toom nim yeep ahm omoro, omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om, do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae, tanampip wonaki uirabaid. Amsekim anggur ohm naimapu waam baria.
+<<<<<<< HEAD
+\v 9 Omki yame toom nim yeep ahm omoro, omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om, do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae, tanampip wonaki uirabaid. Amsekim anggur ohm naimapu waam baria.
+=======
+\v 9 Omki yame toom nim yeep ahm omoro,omki anggur ahm arkum omki om yirari ine tamki hapnapar,omki bapurep ohm batma yanap enok yiriam,omki nim om,do hepe farkum foyapum, \v 10 omki uraro fohmum,"yanap waspaki anggur ohm baidnos raki womkin,amsekin tain ohm naimapu yupuru taski yorirae,tanampip wonaki uirabaid.Amsekim anggur ohm naimapu waam baria.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/11.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 11 Roh naimap om Yeisi omre fomum, yapu Kana omki pem yapu Galilea, saphoyap yeraraam,omki yoyim enem yirapsepe raam omki firkim Yeisi omoro.
 \p
-Yeisi Yapu Kapernaun Omoro
+Yeisi Yapu Kapernaun Omoro
+=======
+\v 11 Roh naimap om Yeisi omre fomum,yapu Kana omki pem yapu Galilea,saphoyap yeraraam,omki yoyim enem yirapsepe raam omki firkim Yeisi omoro.
+(Yeisi Yapu Kapernaun Omoro)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/12.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 12 Omoro waspaki frasemaim, omki yapu Kapernaum omoro yemaim Yeisi pem enou omki peem yanap enem peem yoyim Yeisi enem,omki omoro tam biap ine toiskisamminkum.
 \p
- Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum
+ Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum
+=======
+\v 12 Omoro waspaki frasemaim,omki yapu Kapernaum omoro yemaim Yeisi pem enou omki peem yanap enem peem yoyim Yeisi enem,omki omoro tam biap ine toiskisamminkum.
+(Yeisi Wou Tapur Yasep kaap Kaa Fepefarkum)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/13.txt

@@ -1 +1,5 @@
-\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home, omki pem haap yuku iyem weyem woutapur kaap omoro.
+<<<<<<< HEAD
+\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home, omki pem haap yuku iyem weyem woutapur kaap omoro.
+=======
+\v 13 Omki taam tapur Yahudi yonoppon yirap taaim Yeisi omki semaim yapu Yerusalem omoro. \v 14 Wou tapun eper yasap omoro Yeisi tupsadne pedagang-pedagang lembu,kambing domba,pem supaam mumur/home,omki pem haap yuku iyem weyem woutapur kaap omoro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/15.txt

@@ -1 +1,5 @@
-\v 15 Omki Yeisi hanip yoonop haroh yasep, forkum bari waniki farkum saiakom enkem, wakum, supam, omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam, am wou eper aiaro fare yasap wou alam pamipmam.
+<<<<<<< HEAD
+\v 15 Omki Yeisi hanip yoonop haroh yasep, forkum bari waniki farkum saiakom enkem, wakum, supam, omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam, am wou eper aiaro fare yasap wou alam pamipmam.
+=======
+\v 15 Omki Yeisi hanip yoonop haroh yasep,forkum bari waniki farkum saiakom enkem,wakum,supam,omki pem haap yeepu iyim wiyem haap enekem waspaki bekepiam wum koseme Yeisi omere omki pem harip haap hatepe yasap waspaki parpir arkum Yeisi omre. \v 16 Omki Yeisi omre tomum supam mumur sasa yanapro fahmum waspaki am hepam,am wou eper aiaro fare yasap wou alam pamipmam.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

02/20.txt

@@ -1 +1,5 @@
-\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap  46 peipa/takun bait tariam, pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum, yeram fomin, omki en yirapsem saim yeram roh boup Yeisi enem fomim om.
+<<<<<<< HEAD
+\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap  46 peipa/takun bait tariam, pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum, yeram fomin, omki en yirapsem saim yeram roh boup Yeisi enem fomim om.
+=======
+\v 20 Omki Yahudi yanap fenkum Yeisi omoro:Omki Yahudi yanap  46 peipa/takun bait tariam,pee ahre taam wadkeski em?" \v 21 Pre roh om akisore fohmum wou aiom om warom enem fakir. \v 22 Warom enem taam watkesi ai roki wapina remteipum.Omki yoyim enem hapyose wonaki frikum,yeram fomin,omki en yirapsem saim yeram roh boup Yeisi enem fomim om.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

03/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 3 Fopo Uraroh Menma 
-\p \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi."
+\p \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi."
+=======
+\c 3 (Fopo Uraroh Menma) \v 1 Amro, pahmo nim Farisi yap naenem, Nikodemus, omamar pemimpin bangsa Yahudi yap. \v 2 Isi Pahmo omhom yeisi ahro amki fohmum; rabi, depyiran ah om guru om woki haim ar ahki, omor ine yanap pahmakin, frare tanda tanda naimap omor paski ahre fronom, omor er=nem af ahre, omoro wassirangi."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

03/19.txt

@@ -1,3 +1,7 @@
 \v 19 Amar hukum an; upmaskiweime houm bep amroh pe yanap am ipopke isi kapro ohou, umaski om ine omor beheme om en fitn om tanam. \v 20 Omor yanap yanap akin frare enkem tanam henma upmaski amro pem ine inima upmas kiomro amki omro frare enekem ine ura piupose ura. \v 21 Amar omki, yanape om frare yeraram yar om sepe umaski amro omki fare fakir frare yap enem am amki waski frare faker waina ar ahro."
+<<<<<<< HEAD
 \p
-Yohanes Sapnim Ama Yeisi Ahin Farir
+Yohanes Sapnim Ama Yeisi Ahin Farir
+=======
+(Yohanes Sapnim Ama Yeisi Ahin Farir)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

03/22.txt

@@ -1 +1,5 @@
-\v 22 Omki om, yeisi pem yoim enem, sentim bep Yudea omro, omro woi hemekum taam waspagi enpis omki yarare apu. \v 23 Yohane pahmki apu yaprare wai ainonro yiraap salimro omrohm biap ohm omro yanap yipemki irimayap pem apu yarare. \v 24 Taam amki, Yohanes waam baira hapae ine bue wou kapro.
+<<<<<<< HEAD
+\v 22 Omki om, yeisi pem yoim enem, sentim bep Yudea omro, omro woi hemekum taam waspagi enpis omki yarare apu. \v 23 Yohane pahmki apu yaprare wai ainonro yiraap salimro omrohm biap ohm omro yanap yipemki irimayap pem apu yarare. \v 24 Taam amki, Yohanes waam baira hapae ine bue wou kapro.
+=======
+\v 22 OMRI om, yeisi PEM yoim enem, sentim bep Yudea omro, omro woi hemekum taam waspagi enpis omki yarare apu. \v 23 Yohane pahmki apu yaprare wai ainonro yiraap salimro omrohm biap ohm omro yanap yipemki irimayap pem apu yarare. \v 24 Taam amki, Yohanes waam baira hapae ine bue wou kapro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

03/31.txt

@@ -1 +1,5 @@
-\v 31 Om omor houfeit wapkina om omor wapina waspahgi, omfe om bep amki yeniki, om omor yenie yap omki farfur yasap yasap bepamkayap omfeom surga kihoum om omor wapina waspahgi yasap yasap. \v 32 Omre kesaksian harpe behemeom sahapakum om pem yirairakum om, pe yanap yanap akine hepe kesaksian Enem. \v 33 Yanap berein om kesaksian Enem fare yeraramki, oma Ar om yerahm.
+<<<<<<< HEAD
+\v 31 Om omor houfeit wapkina om omor wapina waspahgi, omfe om bep amki yeniki, om omor yenie yap omki farfur yasap yasap bepamkayap omfeom surga kihoum om omor wapina waspahgi yasap yasap. \v 32 Omre kesaksian harpe behemeom sahapakum om pem yirairakum om, pe yanap yanap akine hepe kesaksian Enem. \v 33 Yanap berein om kesaksian Enem fare yeraramki, oma Ar om yerahm.
+=======
+\v 31 Om omor houfeit wapkina om omor wapina waspahgi, omfe om bep amki yeniki, om omor yenie yap omki farfur yasap yasap bepamkayap omfeom surga kihoum om omor wapina waspahgi yasap yasap. \v 32 OMRE kesaksian harpe behemeom sahapakum om pem yirairakum om, pe yanap yanap akine hepe kesaksian ENEM. \v 33 Yanap berein om kesaksian ENEM fare yeraramki, oma AR om yerahm.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

03/34.txt

@@ -1 +1,5 @@
-\v 34 Pe yanpe om waski kaumari Ar om fenfitn rohmoup Ar aham omor Ar hanim harpakum Roh om ine henep kakan. \v 35 Ali ain eperanam raapro pen omki harpakum yasap yasap akim waina yapkap Enem ro. \v 36 Yanap om yirahpsepy raap omro hepenrum mimiahm naimap peyanap om ine ipopki raapom ine en sahpy mimiahm kukup, omki enem murka Ar ohm omor omoro apnukeitn."
+<<<<<<< HEAD
+\v 34 Pe yanpe om waski kaumari Ar om fenfitn rohmoup Ar aham omor Ar hanim harpakum Roh om ine henep kakan. \v 35 Ali ain eperanam raapro pen omki harpakum yasap yasap akim waina yapkap Enem ro. \v 36 Yanap om yirahpsepy raap omro hepenrum mimiahm naimap peyanap om ine ipopki raapom ine en sahpy mimiahm kukup, omki enem murka Ar ohm omor omoro apnukeitn."
+=======
+\v 34 Pe yanpe om waski kaumari AR om fenfitn rohmoup AR aham omor AR hanim harpakum Roh om ine henep kakan. \v 35 Ali ain eperanam raapro pen omki harpakum yasap yasap akim waina yapkap ENEM ro. \v 36 Yanap om yirahpsepy raap omro hepenrum mimiahm naimap peyanap om ine ipopki raapom ine en sahpy mimiahm kukup, omki enem murka AR ohm omor omoro apnukeitn."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 4 Yeisi Rouk Fare Samaria Douhois
-\p \v 1 Amtegim ohoum Tuhan yirari pree yo oh omoup Farisi end yirari waspahgi apu yaap rare yanap biaap Yohanes,ahre. \v 2 (Prie ohumigi ohum Yeisi ekam apu,yaap rare einne enem yanap Tuhan am mouk), \v 3 Amtegim daak teh paap sepe Yudea yaap pi amgi sepe Galilea yaap pu rouk.
+\p \v 1 Amtegim ohoum Tuhan yirari pree yo oh omoup Farisi end yirari waspahgi apu yaap rare yanap biaap Yohanes,ahre. \v 2 (Prie ohumigi ohum Yeisi ekam apu,yaap rare einne enem yanap Tuhan am mouk), \v 3 Amtegim daak teh paap sepe Yudea yaap pi amgi sepe Galilea yaap pu rouk.
+=======
+\c 4 (Yeisi Rouk Fare Samaria Douhois) \v 1 Amtegim ohoum Tuhan yirari pree yo oh omoup Farisi end yirari waspahgi apu yaap rare yanap biaap Yohanes,ahre. \v 2 (Prie ohumigi ohum Yeisi ekam apu,yaap rare einne enem yanap Tuhan am mouk), \v 3 Amtegim daak teh paap sepe Yudea yaap pi amgi sepe Galilea yaap pu rouk.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/04.txt

@@ -1 +1,5 @@
-\v 4 Prie,ohum mi gi ohum dak ririaap sepe beep Samaria ahgi. \v 5 Daak amtegin oum Yeisi Samaria, beep rouk raap pe yaap pu na pem sikhar, beep pam muro asrape weimegi Yakub ahre harpe raap, enem Yusuf ahrouk.
+<<<<<<< HEAD
+\v 4 Prie,ohum mi gi ohum dak ririaap sepe beep Samaria ahgi. \v 5 Daak amtegin oum Yeisi Samaria, beep rouk raap pe yaap pu na pem sikhar, beep pam muro asrape weimegi Yakub ahre harpe raap, enem Yusuf ahrouk.
+=======
+\v 4 Prie,ohum mi gi ohum dak ririaap sepe beep Samaria ahgi. \v 5 Daak amtegin oum Yeisi Samaria,beep rouk raap pe yaap pu na pem sikhar,beep pam muro asrape weimegi Yakub ahre harpe raap,enem Yusuf ahrouk.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/06.txt

@@ -1 +1,5 @@
-\v 6 Farrem Yakub ahre ohumrouk whoieh.Weimegi, Yeisi semmaim farpem ohum rouk eepeasisi kaap haap teimmegi biokkum.Ohumigi ohum, douh shaam yeipkaatim yeip darem pemmouk 6 Douh shaam yeip kaptim yeip  prem darekaap pammouk thambohpoup akubrouk tarimmoum 12 \v 7 Samaria douh ohum esapehoeim.Yeisi ahre rouk farre,"Daak ohum bah koum heisoum." \v 8 (Yanap-yanap danem waspagi yapu pem rouk yinima sasah sem sanon)
+<<<<<<< HEAD
+\v 6 Farrem Yakub ahre ohumrouk whoieh.Weimegi, Yeisi semmaim farpem ohum rouk eepeasisi kaap haap teimmegi biokkum.Ohumigi ohum, douh shaam yeipkaatim yeip darem pemmouk 6 Douh shaam yeip kaptim yeip  prem darekaap pammouk thambohpoup akubrouk tarimmoum 12 \v 7 Samaria douh ohum esapehoeim.Yeisi ahre rouk farre,"Daak ohum bah koum heisoum." \v 8 (Yanap-yanap danem waspagi yapu pem rouk yinima sasah sem sanon)
+=======
+\v 6 Farrem Yakub ahre ohumrouk whoieh.Weimegi,Yeisi semmaim farpem ohum rouk eepeasisi kaap haap teimmegi biokkum.Ohumigi ohum,douh shaam yeipkaatim yeip darem pemmouk 6.Douh shaam yeip kaptim yeip  prem darekaap pammouk thambohpoup akubrouk tarimmoum 12 \v 7 Samaria douh ohum esapehoeim.Yeisi ahre rouk farre,"Daak ohum bah koum heisoum." \v 8 (Yanap-yanap danem waspagi yapu pem rouk yinima sasah sem sanon)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/09.txt

@@ -1 +1,5 @@
-\v 9 Samaria douh ohum re rouk fare yeisi,ahrouk.Tamsegin ak:Yahudi, yanap oohum keih darouk dak am Samaria douh?"Samaria yanap waspagi end kaounoum yasep Yahudi, gi Samaria yanap Israel yanap rouk houpposmimi kokai haam whouruk.Pre thaam ahumigi ohoum toum yo agama Yahudi ohor fare yasep haapprare Samaria yanap poum. Pre rouk fare wheimegi ohoum,Yeisi ak ohum yori eine yasap pam Samaria douh oumigi.(Pre Yahudi yanap en rouk barmaam fare eine Samaria yanap pis) \v 10 Yeisi ahin rouk farup koseme fare,ahan rouk yirari rouk boup naimaap an am ahan yirari rouk boup am mane fare ahan rouk."Teimdak ohoum;Ahan fenigiren keih darouk, ahan rouk ohoum yapu temimi yasep heikarep.
+<<<<<<< HEAD
+\v 9 Samaria douh ohum re rouk fare yeisi,ahrouk.Tamsegin ak:Yahudi, yanap oohum keih darouk dak am Samaria douh?"Samaria yanap waspagi end kaounoum yasep Yahudi, gi Samaria yanap Israel yanap rouk houpposmimi kokai haam whouruk.Pre thaam ahumigi ohoum toum yo agama Yahudi ohor fare yasep haapprare Samaria yanap poum. Pre rouk fare wheimegi ohoum,Yeisi ak ohum yori eine yasap pam Samaria douh oumigi.(Pre Yahudi yanap en rouk barmaam fare eine Samaria yanap pis) \v 10 Yeisi ahin rouk farup koseme fare,ahan rouk yirari rouk boup naimaap an am ahan yirari rouk boup am mane fare ahan rouk."Teimdak ohoum;Ahan fenigiren keih darouk, ahan rouk ohoum yapu temimi yasep heikarep.
+=======
+\v 9 Samaria douh ohum re rouk fare yeisi,ahrouk.Tamsegin ak:Yahudi,yanap oohum keih darouk dak am Samaria douh?"Samaria yanap waspagi end kaounoum yasep Yahudi,gi Samaria yanap Israel yanap rouk houpposmimi kokai haam whouruk.Pre thaam ahumigi ohoum toum yo agama Yahudi ohor fare yasep haapprare Samaria yanap poum.Pre rouk fare wheimegi ohoum,Yeisi ak ohum yori eine yasap pam Samaria douh oumigi.(Pre Yahudi yanap en rouk barmaam fare eine Samaria yanap pis) \v 10 Yeisi ahin rouk farup koseme fare,ahan rouk yirari rouk boup naimaap an am ahan yirari rouk boup am mane fare ahan rouk."Teimdak ohoum;Ahan fenigiren keih darouk,ahan rouk ohoum yapu temimi yasep heikarep.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/11.txt

@@ -1 +1,5 @@
-\v 11 Samaria douh oumre rouk fare Yeisi ahrouk,"Tuan, ohoum esape yasep epamouk tehein pre farem am kiram, tamgisimegi houppan feep ohoum yapu temimi yasep am? \v 12 Tamsegi ak roum tapur yakam tanam doum Yakub,ahin farem am harpe deep rouk deep ohoum yori ohouna frare fagir eine waspagi yanap toop toop waspagi yasep?
+<<<<<<< HEAD
+\v 11 Samaria douh oumre rouk fare Yeisi ahrouk,"Tuan, ohoum esape yasep epamouk tehein pre farem am kiram, tamgisimegi houppan feep ohoum yapu temimi yasep am? \v 12 Tamsegi ak roum tapur yakam tanam doum Yakub,ahin farem am harpe deep rouk deep ohoum yori ohouna frare fagir eine waspagi yanap toop toop waspagi yasep?
+=======
+\v 11 Samaria douh oumre rouk fare Yeisi ahrouk,"Tuan,ohoum esape yasep epamouk tehein pre farem am kiram,tamgisimegi houppan feep ohoum yapu temimi yasep am? \v 12 Tamsegi ak roum tapur yakam tanam doum Yakub,ahin farem am harpe deep rouk deep ohoum yori ohouna frare fagir eine waspagi yanap toop toop waspagi yasep?
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/13.txt

@@ -1 +1,5 @@
-\v 13 Yeisi rouk booup fare, farup kousem enrouk, ohoum yanap ohoum si frare yori wayaap, \v 14 Mein yanap ohoum am yori en dare harpe en ohoum simamai rigitn's;Pre ohoum heipop anrouk ohoum hamin woh waruk kaap rouk farem farem rare fagi amtegi whounagi thaam."
+<<<<<<< HEAD
+\v 13 Yeisi rouk booup fare, farup kousem enrouk, ohoum yanap ohoum si frare yori wayaap, \v 14 Mein yanap ohoum am yori en dare harpe en ohoum simamai rigitn's;Pre ohoum heipop anrouk ohoum hamin woh waruk kaap rouk farem farem rare fagi amtegi whounagi thaam."
+=======
+\v 13 Yeisi rouk booup fare,farup kousem enrouk,ohoum yanap ohoum si frare yori wayaap, \v 14 Mein yanap ohoum am yori en dare harpe en ohoum simamai rigitn's;Pre ohoum heipop anrouk ohoum hamin woh waruk kaap rouk farem farem rare fagi amtegi whounagi thaam."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/15.txt

@@ -1 +1,5 @@
-\v 15 Samaaria douh ohumre rouk fare Yeisi, arrouk"tuan heim dak ohoum ohoum pre daak aohosimaamrare fagi. Pre daak ourarouk ahoum esappe amrouk inmamaam rare fagi.' \v 16 Yeisi ahin rouk fare,"Ahimar,nim anam foyape oumigi, wheigina amrouk hae."
+<<<<<<< HEAD
+\v 15 Samaaria douh ohumre rouk fare Yeisi, arrouk"tuan heim dak ohoum ohoum pre daak aohosimaamrare fagi. Pre daak ourarouk ahoum esappe amrouk inmamaam rare fagi.' \v 16 Yeisi ahin rouk fare,"Ahimar,nim anam foyape oumigi, wheigina amrouk hae."
+=======
+\v 15 Samaaria douh ohumre rouk fare Yeisi,arrouk"tuan heim dak ohoum ohoum pre daak aohosimaamrare fagi.Pre daak ourarouk ahoum esappe amrouk inmamaam rare fagi.' \v 16 Yeisi ahin rouk fare,"Ahimar,nim anam foyape oumigi,wheigina amrouk hae."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/21.txt

@@ -1 +1,5 @@
-\v 21 Yeisi rouk boup enem,"Yirap semore darouk, ahan wasipsep amtegin thaam am eine taapeigi pemigi eine Yerusalem yanap eepir moup ahai. \v 22 Aham eepir boigmanigim oum dak yirari eine, pre deep eepir deep yirari deep kekaptepe houkeid yoyim Yahudi.
+<<<<<<< HEAD
+\v 21 Yeisi rouk boup enem,"Yirap semore darouk, ahan wasipsep amtegin thaam am eine taapeigi pemigi eine Yerusalem yanap eepir moup ahai. \v 22 Aham eepir boigmanigim oum dak yirari eine, pre deep eepir deep yirari deep kekaptepe houkeid yoyim Yahudi.
+=======
+\v 21 Yeisi rouk boup enem,"Yirap semore darouk,ahan wasipsep amtegin thaam am eine taapeigi pemigi eine Yerusalem yanap eepir moup ahai. \v 22 Aham eepir boigmanigim oum dak yirari eine,pre deep eepir deep yirari deep kekaptepe houkeid yoyim Yahudi.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/23.txt

@@ -1 +1,5 @@
-\v 23 Oumig oum thaam, houpein amegimam eepir-eepir yeram ram eepir ahi arouk rouk asip yeram ram, pre rouk kaap ahai amgi wanigi eepir am. \v 24 Ar ahin omum rouk asip oumigi een oum  eepir waapigina eepir fare rouk asip yeram ram."
+<<<<<<< HEAD
+\v 23 Oumig oum thaam, houpein amegimam eepir-eepir yeram ram eepir ahi arouk rouk asip yeram ram, pre rouk kaap ahai amgi wanigi eepir am. \v 24 Ar ahin omum rouk asip oumigi een oum  eepir waapigina eepir fare rouk asip yeram ram."
+=======
+\v 23 Oumig oum thaam,houpein amegimam eepir-eepir yeram ram eepir ahi arouk rouk asip yeram ram,pre rouk kaap ahai amgi wanigi eepir am. \v 24 Ar ahin omum rouk asip oumigi een oum  eepir waapigina eepir fare rouk asip yeram ram."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/27.txt

@@ -1 +1,5 @@
-\v 27 Thaam amtegim, houre yanap-yanap am en ohou Yeisi ahin sape oum rouk boup fare ounoup oumpis. Pre, yanap enre rouk fate eine enrouk."Tamtegin an hak tein? Oumigi an bekerouk oumpis?"
+<<<<<<< HEAD
+\v 27 Thaam amtegim, houre yanap-yanap am en ohou Yeisi ahin sape oum rouk boup fare ounoup oumpis. Pre, yanap enre rouk fate eine enrouk."Tamtegin an hak tein? Oumigi an bekerouk oumpis?"
+=======
+\v 27 Thaam amtegim,houre yanap-yanap am en ohou Yeisi ahin sape oum rouk boup fare ounoup oumpis.Pre,yanap enre rouk fate eine enrouk."Tamtegin an hak tein?Oumigi an bekerouk oumpis?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/28.txt

@@ -1 +1,5 @@
-\v 28 Oumigi oum, douh oum teemam semamim ohoum esape yasep temam semamim yapu kap rouk rouk fare enrouk yanap-yanap oum rouk waspagi. \v 29 Eih, sepe saian am amtegim yanap-yanap waspagi rouk asip da rouk dare fokharpe.Oum Mesias arhau? \v 30 Yanap-yanap waspagi sepe yapu rouk Yeisi ahin sepe fagi.
+<<<<<<< HEAD
+\v 28 Oumigi oum, douh oum teemam semamim ohoum esape yasep temam semamim yapu kap rouk rouk fare enrouk yanap-yanap oum rouk waspagi. \v 29 Eih, sepe saian am amtegim yanap-yanap waspagi rouk asip da rouk dare fokharpe.Oum Mesias arhau? \v 30 Yanap-yanap waspagi sepe yapu rouk Yeisi ahin sepe fagi.
+=======
+\v 28 Oumigi oum,douh oum teemam semamim ohoum esape yasep temam semamim yapu kap rouk rouk fare enrouk yanap-yanap oum rouk waspagi. \v 29 Eih,sepe saian am amtegim yanap-yanap waspagi rouk asip da rouk dare fokharpe.Oum Mesias arhau? \v 30 Yanap-yanap waspagi sepe yapu rouk Yeisi ahin sepe fagi.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/31.txt

@@ -1 +1,5 @@
-\v 31 Ainte gim oum, yanap-yanap enem oum paran.Yeisi rouk asip fare"Rabi hemam ar." \v 32 Amtegim, daak rouk asip yaap fare anrouk"Dab nem yinima baam am ahan sapae eine." \v 33 Yanap-yanap enem eiye weiyye kap rouk farupae sape ekamep waina."Amtegim am deep yanap yak saramis yaspam hamnima eine teim deep hapri yasep?"
+<<<<<<< HEAD
+\v 31 Ainte gim oum, yanap-yanap enem oum paran.Yeisi rouk asip fare"Rabi hemam ar." \v 32 Amtegim, daak rouk asip yaap fare anrouk"Dab nem yinima baam am ahan sapae eine." \v 33 Yanap-yanap enem eiye weiyye kap rouk farupae sape ekamep waina."Amtegim am deep yanap yak saramis yaspam hamnima eine teim deep hapri yasep?"
+=======
+\v 31 Ainte gim oum,yanap-yanap enem oum paran.Yeisi rouk asip fare"Rabi hemam ar." \v 32 Amtegim,daak rouk asip yaap fare anrouk"Dab nem yinima baam am ahan sapae eine." \v 33 Yanap-yanap enem eiye weiyye kap rouk farupae sape ekamep waina."Amtegim am deep yanap yak saramis yaspam hamnima eine teim deep hapri yasep?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/34.txt

@@ -1 +1,5 @@
-\v 34 Yeisi rouk asip fare,"Baam yinma danem am wagina ai ak gi darouk harpei dak mimir mimir frare.An re rouk ein ne. \v 35 Haram bapmeteim arupeidn's taatne yasap? Saim ar dak rouk arauk feep am saam haateam ar pre saam yaksaiptarep - yaksoip tarep dum berem ahai rare feidn's. \v 36 Oumtegim oum,yukakne nim ai are kamteikeidn's oumigi oum weyaam kakose ai are yapu temimi kakup yaksoip hee yanap taatne yanaap ein heepe ohou waspagi.
+<<<<<<< HEAD
+\v 34 Yeisi rouk asip fare,"Baam yinma danem am wagina ai ak gi darouk harpei dak mimir mimir frare.An re rouk ein ne. \v 35 Haram bapmeteim arupeidn's taatne yasap? Saim ar dak rouk arauk feep am saam haateam ar pre saam yaksaiptarep - yaksoip tarep dum berem ahai rare feidn's. \v 36 Oumtegim oum,yukakne nim ai are kamteikeidn's oumigi oum weyaam kakose ai are yapu temimi kakup yaksoip hee yanap taatne yanaap ein heepe ohou waspagi.
+=======
+\v 34 Yeisi rouk asip fare,"Baam yinma danem am wagina ai ak gi darouk harpei dak mimir mimir frare.An re rouk ein ne. \v 35 Haram bapmeteim arupeidn's taatne yasap?Saim ar dak rouk arauk feep am saam haateam ar pre saam yaksaiptarep - yaksoip tarep dum berem ahai rare feidn's. \v 36 Oumtegim oum,yukakne nim ai are kamteikeidn's oumigi oum weyaam kakose ai are yapu temimi kakup yaksoip hee yanap taatne yanaap ein heepe ohou waspagi.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/39.txt

@@ -1 +1,5 @@
-\v 39 Samaria yanap biap rouk asip yisiam yirari kakap pre rouk boup Samaria douh oumigi,oumre rouk faruppur faregi."Rouk waspagi rouk asip faruppur foumum oum." \v 40 Deep,yanap-yanap waspagi Samaria yanap waspagi rouk asip Yeisi, am yirap deep keih oum rouk mimiam kakup heepe fagir enpis Yeisi apis mimifagir om rouk thaam toisgi ahairare.
+<<<<<<< HEAD
+\v 39 Samaria yanap biap rouk asip yisiam yirari kakap pre rouk boup Samaria douh oumigi,oumre rouk faruppur faregi."Rouk waspagi rouk asip faruppur foumum oum." \v 40 Deep,yanap-yanap waspagi Samaria yanap waspagi rouk asip Yeisi, am yirap deep keih oum rouk mimiam kakup heepe fagir enpis Yeisi apis mimifagir om rouk thaam toisgi ahairare.
+=======
+\v 39 Samaria yanap biap rouk asip yisiam yirari kakap pre rouk boup Samaria douh oumigi,oumre rouk faruppur faregi."Rouk waspagi rouk asip faruppur foumum oum." \v 40 Deep,yanap-yanap waspagi Samaria yanap waspagi rouk asip Yeisi,am yirap deep keih oum rouk mimiam kakup heepe fagir enpis Yeisi apis mimifagir om rouk thaam toisgi ahairare.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/41.txt

@@ -1,2 +1,6 @@
 \v 41 Pri,yanap biap yirari rouk bouk danem amrouk Yeisi dekan are. \v 42 En rouk fare douh oum rouk."Amtegin am deep rouk boup anamrouk yirap,prei deep anep pante gim rouk boup oum yirap,deep yeram-weram sarap,yirap pre oum waroum depoum kekap tepe yasap."
-\s Raap Tuan Yaapu Rouk Kekap Teepe
+<<<<<<< HEAD
+\s Raap Tuan Yaapu Rouk Kekap Teepe
+=======
+(Raap Tuan Yaapu Rouk Kekap Teepe)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/43.txt

@@ -1 +1,5 @@
-\v 43 Taam toisgi ahai rare, Yeisi temaam semaim mimiam oum sepe Galilea yapu rouk. \v 44 (Mimir mamgi, Yeisi ahim rouk farup kouseme pre yanap ein epir fare eine beeip enekem rouk). \v 45 Oumigi oum Yeisi, ahim yapu Galilea oum rouk Galilea yanap ohou waspagi sapae yesep namaap raam yame firipip Yerusalem yapu am rouk en waspagi sepe yame oum rouk.
+<<<<<<< HEAD
+\v 43 Taam toisgi ahai rare, Yeisi temaam semaim mimiam oum sepe Galilea yapu rouk. \v 44 (Mimir mamgi, Yeisi ahim rouk farup kouseme pre yanap ein epir fare eine beeip enekem rouk). \v 45 Oumigi oum Yeisi, ahim yapu Galilea oum rouk Galilea yanap ohou waspagi sapae yesep namaap raam yame firipip Yerusalem yapu am rouk en waspagi sepe yame oum rouk.
+=======
+\v 43 Taam toisgi ahai rare,Yeisi temaam semaim mimiam oum sepe Galilea yapu rouk. \v 44 (Mimir mamgi,Yeisi ahim rouk farup kouseme pre yanap ein epir fare eine beeip enekem rouk). \v 45 Oumigi oum Yeisi,ahim yapu Galilea oum rouk Galilea yanap ohou waspagi sapae yesep namaap raam yame firipip Yerusalem yapu am rouk en waspagi sepe yame oum rouk.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

04/51.txt

@@ -1 +1,5 @@
-\v 51 Nim oum, tuan ni yapu oumaga yasep hamin bouroup houk semamum foumum; kekar-kekar yanap oum rouk asip yaafare paap anam oum remar hamiumigi. \v 52 Tuan ni yapu oumga nim rouk asip yaafram pre douh saam tamsegi warum anam waniekap raap anam oum naimaafram teim. Pre, en oum rouk boup asip fare.'Si pe taam douh saam yeip kaptim yeip derakap toisgi dou saam yeip kaptim eip darekap touisgi taam boupoup kakurouk 7 yaru yasep raap enem oum teipih.
+<<<<<<< HEAD
+\v 51 Nim oum, tuan ni yapu oumaga yasep hamin bouroup houk semamum foumum; kekar-kekar yanap oum rouk asip yaafare paap anam oum remar hamiumigi. \v 52 Tuan ni yapu oumga nim rouk asip yaafram pre douh saam tamsegi warum anam waniekap raap anam oum naimaafram teim. Pre, en oum rouk boup asip fare.'Si pe taam douh saam yeip kaptim yeip derakap toisgi dou saam yeip kaptim eip darekap touisgi taam boupoup kakurouk 7 yaru yasep raap enem oum teipih.
+=======
+\v 51 Nim oum,tuan ni yapu oumaga yasep hamin bouroup houk semamum foumum;kekar-kekar yanap oum rouk asip yaafare paap anam oum remar hamiumigi. \v 52 Tuan ni yapu oumga nim rouk asip yaafram pre douh saam tamsegi warum anam waniekap raap anam oum naimaafram teim.Pre,en oum rouk boup asip fare.'Si pe taam douh saam yeip kaptim yeip derakap toisgi dou saam yeip kaptim eip darekap touisgi taam boupoup kakurouk 7 yaru yasep raap enem oum teipih.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

05/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 5 Am Se Arkum Nim Paxmok Bain Tairimum Tam Epe Axsisi Amfarem Betesda 
-\p \v 1 Amse menap bironom, om am tam epeavsisi yanap Yahudi enkem Yesus kapkarakumaan yemain Yesusalem omro. \v 2 Amro Yerusalem yirap enbup juah domba ambro pamok sain farem poe naniem Ibrani paxpsane Betesda are om wuu soasi hap tanam paxamsegi paapsan Betsaida om gipem betzatha paxmok farem daremyateram efene Allah Yerusalem pem kakape kaptem wuu harip. \v 3 Harip harip, om am biap yanap hamoum hiraxapbiokum yanap fani, yanap kurap, pem yanap tikte en hoo teiepnum oxom amro farem amro. \v 4 Pee tam omsepamok omsepamok kaipein malaikat Tuhan amro suru epe farem omro pem biremakum oxom am. Yanap pee yup ram yepee farem amse oxom am woxom yakoxom yepturu amse seiskane amgi yaruruh pemom paxamse beke yaruruh axnere.
+\p \v 1 Amse menap bironom, om am tam epeavsisi yanap Yahudi enkem Yesus kapkarakumaan yemain Yesusalem omro. \v 2 Amro Yerusalem yirap enbup juah domba ambro pamok sain farem poe naniem Ibrani paxpsane Betesda are om wuu soasi hap tanam paxamsegi paapsan Betsaida om gipem betzatha paxmok farem daremyateram efene Allah Yerusalem pem kakape kaptem wuu harip. \v 3 Harip harip, om am biap yanap hamoum hiraxapbiokum yanap fani, yanap kurap, pem yanap tikte en hoo teiepnum oxom amro farem amro. \v 4 Pee tam omsepamok omsepamok kaipein malaikat Tuhan amro suru epe farem omro pem biremakum oxom am. Yanap pee yup ram yepee farem amse oxom am woxom yakoxom yepturu amse seiskane amgi yaruruh pemom paxamse beke yaruruh axnere.
+=======
+\c 5 (Am Se Arkum Nim Paxmok Bain Tairimum Tam Epe Axsisi Amfarem Betesda) \v 1 Amse menap bironom, om am tam epeavsisi yanap Yahudi enkem Yesus kapkarakumaan yemain Yesusalem omro. \v 2 Amro Yerusalem yirap enbup juah domba ambro pamok sain farem poe naniem Ibrani paxpsane Betesda are om wuu soasi hap tanam paxamsegi paapsan Betsaida om gipem betzatha paxmok farem daremyateram efene Allah Yerusalem pem kakape kaptem wuu harip. \v 3 Harip harip, om am biap yanap hamoum hiraxapbiokum yanap fani, yanap kurap, pem yanap tikte en hoo teiepnum oxom amro farem amro. \v 4 Pee tam omsepamok omsepamok kaipein malaikat Tuhan amro suru epe farem omro pem biremakum oxom am. Yanap pee yup ram yepee farem amse oxom am woxom yakoxom yepturu amse seiskane amgi yaruruh pemom paxamse beke yaruruh axnere.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

05/16.txt

@@ -1,3 +1,7 @@
 \v 16 Pee omfagir yanap yanap hamar Yesus axro bepee om farhutein waspax om amta hapasi tam epexasisi. \v 17 Pere omsefagir Yesus roxfarpur amgi enero, axix nemro faroxmin mimir amse wam faroxmin amsegim am, omfagi dax wa farap mimir." \v 18 Rox enekem fu rukum om yanap yanam Yahudi paham humtariam om wasesi Yesus ine enekem Yesus roxkakane tam hapasi pere paxamse omor pap sene Allah amse oxmain aienem oxna, pem amre femain waroxom enem paxmse am Allah.
+<<<<<<< HEAD
 \p
-Oxitom Allah Naxniem Yesus
+Oxitom Allah Naxniem Yesus
+=======
+(Oxitom Allah Naxniem Yesus)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/01.txt

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 \c 6 Jinma Am Yanap Biap Poum Jeipre Kaptimegi Pipa 
-\p \v 1 Omigi gum froteimeki, jeisi ahain wantna kasurumaim bapan Galelia, na pem bapan Tiberias. \v 2 Yanap biab rirap inma en sapae rouk ohnim rahnim tapur omre akute hasmoum yanap. \v 3 Ohumigi jeisi ahain semamu tape rouh wapina teimum yanap yanap enempis.
+\p \v 1 Omigi gum froteimeki, jeisi ahain wantna kasurumaim bapan Galelia, na pem bapan Tiberias. \v 2 Yanap biab rirap inma en sapae rouk ohnim rahnim tapur omre akute hasmoum yanap. \v 3 Ohumigi jeisi ahain semamu tape rouh wapina teimum yanap yanap enempis.
+=======
+\c 6 (Jinma Am Yanap Biap Poum Jeipre Kaptimegi Pipa) \v 1 Omigi gum froteimeki, jeisi ahain wantna kasurumaim bapan Galelia, na pem bapan Tiberias. \v 2 Yanap biab rirap inma en sapae rouk ohnim rahnim tapur omre akute hasmoum yanap. \v 3 Ohumigi jeisi ahain semamu tape rouh wapina teimum yanap yanap enempis.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/13.txt

@@ -1,3 +1,7 @@
 \v 13 Pre ohum yahaapjojim jinma baam yaapi haiteh jeip kapir jeip prem kapir apir toisgi rigum baam jinma am oumur jeipre kapir baam harpaan joros hepenukum ohamkayaap. \v 14 Pre yahnap-yahnap ohum sapae pisih touhteh jeisi, en rouk forupur, am nim amyer am tuanram weimegi boup sas harpe daak houpoup beep amrouk." \v 15 Pre yahaap biaap ohum jirari ohum rouk boup asip taatnis harpe inma masep tri terap pre ohum toum enekem, jeisi werema suru epe taape rouk ohunarouk.
+<<<<<<< HEAD
 \p
-Yeisi Ahin SEpe Waapgina Ohoum Rouk
+Yeisi Ahin SEpe Waapgina Ohoum Rouk
+=======
+(Jeisi Ahin SEpe Waapgina Ohoum Rouk)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/16.txt

@@ -1 +1,5 @@
-\v 16 Amtegim taam waspagi isi aidn'ts yanaap waspagi sepe werenigi bapanrouk. \v 17 Waspagi ohum amuruk werena toiepe, en sepe bapan Kapernaum. Taam asegi am isi aidor, o, pre jeisi ahain waam een toup satne eine. \v 18 Bapan waspagi ohum tapur aidn'ts pre namu waspagi suru tapur aidn't.
+<<<<<<< HEAD
+\v 16 Amtegim taam waspagi isi aidn'ts yanaap waspagi sepe werenigi bapanrouk. \v 17 Waspagi ohum amuruk werena toiepe, en sepe bapan Kapernaum. Taam asegi am isi aidor, o, pre jeisi ahain waam een toup satne eine. \v 18 Bapan waspagi ohum tapur aidn'ts pre namu waspagi suru tapur aidn't.
+=======
+\v 16 Amtegim taam waspagi isi aidn'ts yanaap waspagi sepe werenigi bapanrouk. \v 17 Waspagi ohum amuruk werena toiepe, en sepe bapan K/apernaum. Taam asegi am isi aidor,o, pre jeisi ahain waam een toup satne eine. \v 18 Bapan waspagi ohum tapur aidn'ts pre namu waspagi suru tapur aidn't.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/19.txt

@@ -1,3 +1,7 @@
 \v 19 Oumigi oum, en wasigi kiksepe amu ohoum jirap maam toisgi jeipre kaptim toin pem watkosi sepaam bapiam, en sapaeh jeisi ahim wapgina bapan rouk sepe amar amurouk jirap ram en touh trare. \v 20 Ohumigi oum, jeisi ahin rouk boup asip tare, "Am daak, an touh eine!" \v 21 Enre amu kaaprouk yaap tei epe pre amu oumruk param sis yari enre pesaim omruk. 
+<<<<<<< HEAD
 \p
-Yanap Biap Jeisi Ahin Haak
+Yanap Biap Jeisi Ahin Haak
+=======
+(Yanap Biap Jeisi Ahin Haak)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/24.txt

@@ -1,4 +1,8 @@
 \v 24 Pre yanap biap sopa oumigi jeisi apis yahapap enempis jirari eneram ouruk, en amuru amu enkem oum sepe Kapernaum rouk jeisi ahun haak.
+<<<<<<< HEAD
 \s
 Jeisi Ahain Baam Houposmi Minim
-\p \v 25 Taam pemgi yanap biaap oum toup saatne jeisi ahin sepe daapari rouk, rouk fare enrouk, "Tuan inikin ak am rouk sepe?"
+\p \v 25 Taam pemgi yanap biaap oum toup saatne jeisi ahin sepe daapari rouk, rouk fare enrouk, "Tuan inikin ak am rouk sepe?"
+=======
+(Jeisi Ahain Baam Houposmi Minim) \v 25 Taam pemgi yanap biaap oum toup saatne jeisi ahin sepe daapari rouk, rouk fare enrouk, "Tuan inikin ak am rouk sepe?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/57.txt

@@ -1,3 +1,7 @@
 \v 57 Waspagi oum rouk boup asip yapu temimi yasep ahiam dakilam yapu miniam teimimi pemki eine ahiagi ouhna pre mein dak hapri yanaap pasgim ai ahm yapu temimidak pasgim. \v 58 Amar ar baan wagina mimia kaap ai amgi, eine baam deipri haapri froimourip tarno yakam tanamre foumourip oupasgi, pre en hednepe; yanap baam am hapre oum yapu temimi yasep." \v 59 Jeisi ahin waspagirouk boup asip foharpe Kapernaum yapu oumrouk weimegi raam foharpe yapu sinagoge rouk. 
+<<<<<<< HEAD
 \p
- Biap Yanap Pesaim Ouhna Temam Bemsaim
+ Biap Yanap Pesaim Ouhna Temam Bemsaim
+=======
+(Biap Yanap Pesaim Ouhna Temam Bemsaim)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

06/title.txt

@@ -1 +1,5 @@
-Pasal 6
+<<<<<<< HEAD
+Pasal 6
+=======
+Pasal Pasal 6
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/01.txt

@@ -1 +1,5 @@
-\c 8 \v 1 Pe amfakir,Yeisi supramu kakupgi,semaim tape Zaitun omoro. \v 2 Supra moupkgi, om houm ura amar bait Ar Aham omoro,pem waspagi yanap semhonkum omoro.Om omoro yeteimeki pem fohrpy enero. \v 3 Omki,ahli Taurat pe Farisi yanap yahpesaim doo pahmo,omoro tupm sah iyaim houn sisidoo, omki yebaitmei temeki doo om woi bopo kakupro,
+<<<<<<< HEAD
+\c 8 \v 1 Pe amfakir,Yeisi supramu kakupgi,semaim tape Zaitun omoro. \v 2 Supra moupkgi, om houm ura amar bait Ar Aham omoro,pem waspagi yanap semhonkum omoro.Om omoro yeteimeki pem fohrpy enero. \v 3 Omki,ahli Taurat pe Farisi yanap yahpesaim doo pahmo,omoro tupm sah iyaim houn sisidoo, omki yebaitmei temeki doo om woi bopo kakupro,
+=======
+\c 8 \v 1 Pe amfakir,Yeisi supramu kakupgi,semaim tape Zaitun omoro. \v 2 Supra moupkgi,om houm ura amar bait Ar Aham omoro,pem waspagi yanap semhonkum omoro.Om omoro yeteimeki pem fohrpy enero. \v 3 Omki,ahli Taurat pe Farisi yanap yahpesaim doo pahmo,omoro tupm sah iyaim houn sisidoo,omki yebaitmei temeki doo om woi bopo kakupro,
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/04.txt

@@ -1 +1,5 @@
-\v 4 En fenkum Yeisi ahro,"Guru, doo am yahpe tep kapur houn sisi woo frohn meki. \v 5 Hukum Taurat Musa ahre fahmum depro om onop ompaski om amhouagi.Tamsekim hapyose ahnkim om yasap amfakir?" \v 6 En fenkum om omseki hapraki sahpy Yeisi ahain,omor tenneheyahpy konom yapom hesant tepe fakir om. Pe omki,Yeisi tigite pem ohoitohm kakum enemkgi, ore teremakum yeina peiro.
+<<<<<<< HEAD
+\v 4 En fenkum Yeisi ahro,"Guru, doo am yahpe tep kapur houn sisi woo frohn meki. \v 5 Hukum Taurat Musa ahre fahmum depro om onop ompaski om amhouagi.Tamsekim hapyose ahnkim om yasap amfakir?" \v 6 En fenkum om omseki hapraki sahpy Yeisi ahain,omor tenneheyahpy konom yapom hesant tepe fakir om. Pe omki,Yeisi tigite pem ohoitohm kakum enemkgi, ore teremakum yeina peiro.
+=======
+\v 4 En fenkum Yeisi ahro,"Guru,doo am yahpe tep kapur houn sisi woo frohn meki. \v 5 Hukum Taurat Musa ahre fahmum depro om onop ompaski om amhouagi.Tamsekim hapyose ahnkim om yasap amfakir?" \v 6 En fenkum om omseki hapraki sahpy Yeisi ahain,omor tenneheyahpy konom yapom hesant tepe fakir om.Pe omki,Yeisi tigite pem ohoitohm kakum enemkgi,ore teremakum yeina peiro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/09.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 9 Omki enn yiriaim yasap om, en omki sepe pahmo-pahmo, omor om yupyupki, pem Yeisi temahm semtohm  ohona raam om omor doo pahmo om waam raman om bopokokupro. \v 10 Omki Yeisi ropokum  pem omki fohmum om doo omoro, hai wasipep tamrain  en?Ine tain yanapere hukuman harpy ahanro? \v 11 Fohmim doo om, ine raame Tuhan, Yeisi fohmum dahre ine harpy hukuman ahro, soum sepy pe omor omki omki neinarohm berkap yahpsane frare uraroh.
 \p
-Yeisi Upmaski-Bepamrohm
+Yeisi Upmaski-Bepamrohm
+=======
+\v 9 Omki enn yiriaim yasap om,en omki sepe pahmo-pahmo,omor om yupyupki,pem Yeisi temahm semtohm  ohona raam om omor doo pahmo om waam raman om bopokokupro. \v 10 Omki Yeisi ropokum  pem omki fohmum om doo omoro,hai wasipep tamrain  en?Ine tain yanapere hukuman harpy ahanro? \v 11 Fohmim doo om,ine raame Tuhan,Yeisi fohmum dahre ine harpy hukuman ahro,soum sepy pe omor omki omki neinarohm berkap yahpsane frare uraroh.
+(Yeisi Upmaski-Bepamrohm)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/12.txt

@@ -1 +1,5 @@
-\v 12 Yeisi fohmum omo yanap biap omoro, amaseki roh enem, dahar up maski bep am,yanap-yanap akin ipopgki dahrom, ine pahmakin inimawainaisi rapro, enemom ekamep hapefin upmaki raam." \v 13 Omki, Farisi yanap fankum om Yeisi ahro, ah fomen om omor warohm anam fakir onohaf omki roh anam om ine yeram."
+<<<<<<< HEAD
+\v 12 Yeisi fohmum omo yanap biap omoro, amaseki roh enem, dahar up maski bep am,yanap-yanap akin ipopgki dahrom, ine pahmakin inimawainaisi rapro, enemom ekamep hapefin upmaki raam." \v 13 Omki, Farisi yanap fankum om Yeisi ahro, ah fomen om omor warohm anam fakir onohaf omki roh anam om ine yeram."
+=======
+\v 12 Yeisi fohmum omo yanap biap omoro,amaseki roh enem,dahar up maski bep am,yanap-yanap akin ipopgki dahrom,ine pahmakin inimawainaisi rapro,enemom ekamep hapefin upmaki raam." \v 13 Omki,Farisi yanap fankum om Yeisi ahro,ah fomen om omor warohm anam fakir onohaf omki roh anam om ine yeram."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/14.txt

@@ -1 +1,5 @@
-\v 14 Yeisi fohmum enero, amsumakiri pahmakin dah farfur om warohm nem faker onaha, kesaksian dahnem yeraam, omor dah yirari tamkin dah houmuni.Omki tamro aifoppe ahan ine yirari tamkin om dah semhoumni. \v 15 Ahan haprare om itnepki frare keda gingan, pe om fakir dah ine pahmakin hapraki sahpe pahmakin. \v 16 Ompaski om,dahre haprare om, frareyep dahre om yeraraam. Amar dah ine haprare yanap pahmoro.Enem om waspahgi Aii Dah kaumari nim.
+<<<<<<< HEAD
+\v 14 Yeisi fohmum enero, amsumakiri pahmakin dah farfur om warohm nem faker onaha, kesaksian dahnem yeraam, omor dah yirari tamkin dah houmuni.Omki tamro aifoppe ahan ine yirari tamkin om dah semhoumni. \v 15 Ahan haprare om itnepki frare keda gingan, pe om fakir dah ine pahmakin hapraki sahpe pahmakin. \v 16 Ompaski om,dahre haprare om, frareyep dahre om yeraraam. Amar dah ine haprare yanap pahmoro.Enem om waspahgi Aii Dah kaumari nim.
+=======
+\v 14 Yeisi fohmum enero,amsumakiri pahmakin dah farfur om warohm nem faker onaha,kesaksian dahnem yeraam,omor dah yirari tamkin dah houmuni.Omki tamro aifoppe ahan ine yirari tamkin om dah semhoumni. \v 15 Ahan haprare om itnepki frare keda gingan,pe om fakir dah ine pahmakin hapraki sahpe pahmakin. \v 16 Ompaski om,dahre haprare om,frareyep dahre om yeraraam.Amar dah ine haprare yanap pahmoro.Enem om waspahgi Aii Dah kaumari nim.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/17.txt

@@ -1 +1,5 @@
-\v 17 Om fakir naina buku Taurat Ahankim, teremremi nim omor sapae yanap tuski om yeraraam. \v 18 Dahre frare yapom warohm nem fakir,pem Aii dah kaumarinim om, farfus om dah fakir."
+<<<<<<< HEAD
+\v 17 Om fakir naina buku Taurat Ahankim, teremremi nim omor sapae yanap tuski om yeraraam. \v 18 Dahre frare yapom warohm nem fakir,pem Aii dah kaumarinim om, farfus om dah fakir."
+=======
+\v 17 Om fakir naina buku Taurat Ahankim,teremremi nim omor sapae yanap tuski om yeraraam. \v 18 Dahre frare yapom warohm nem fakir,pem Aii dah kaumarinim om,farfus om dah fakir."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/19.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 19 Omki, ennfare omoro, tamrohin Aii ahan kim? Yeisi fohmum  Ahan ine dauteiyepe pem yiirnem, omki ahn daiteiyep edah, ahan pahmsekim om daiteiyepafiren fir nahnem?" \v 20 Roh moup am Yeisi ahre fohmum,woi yirap perbendaharaan hayape omoro om omortaam sepy ine.
 \p
-Yeisi Fohmum Om Aii Fakir
+Yeisi Fohmum Om Aii Fakir
+=======
+\v 19 Omki,ennfare omoro,tamrohin Aii ahan kim?Yeisi fohmum  Ahan ine dauteiyepe pem yiirnem,omki ahn daiteiyep edah,ahan pahmsekim om daiteiyepafiren fir nahnem?" \v 20 Roh moup am Yeisi ahre fohmum,woi yirap perbendaharaan hayape omoro om omortaam sepy ine.
+(Yeisi Fohmum Om Aii Fakir)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/21.txt

@@ -1 +1,5 @@
-\v 21 Omki Yeisi fohmum ura enero."Dahre tepehsepe ahan omki ahan hah dahro, omki ahan om hatnepe waina yahpsatne ahn kim ro,tamroin om dah soufop om ahan ine dahro inima? \v 22 "Omki Yahudi yanap om fare, tamsekim wase fakir warohm enem, omki fare, tamroin dah soufop om ahan ine dahro inima?"
+<<<<<<< HEAD
+\v 21 Omki Yeisi fohmum ura enero."Dahre tepehsepe ahan omki ahan hah dahro, omki ahan om hatnepe waina yahpsatne ahn kim ro,tamroin om dah soufop om ahan ine dahro inima? \v 22 "Omki Yahudi yanap om fare, tamsekim wase fakir warohm enem, omki fare, tamroin dah soufop om ahan ine dahro inima?"
+=======
+\v 21 Omki Yeisi fohmum ura enero."Dahre tepehsepe ahan omki ahan hah dahro,omki ahan om hatnepe waina yahpsatne ahn kim ro,tamroin om dah soufop om ahan ine dahro inima? \v 22 "Omki Yahudi yanap om fare,tamsekim wase fakir warohm enem,omki fare,tamroin dah soufop om ahan ine dahro inima?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/23.txt

@@ -1 +1,5 @@
-\v 23 Pe om fakir,Yeisi fare enero,"Ahan seprare yanki wapina pe dah wapie yap, ahan am bep ainha yap, pe dah ine bep amkayap. \v 24 Omseki fakir om, dah frare, ahanrohm aham om hatnepy, waina yahpsatne ahankimro omor ahan ine yorahpsepy dahro ahan hatnepy yahpsatne-yahpsatne ahan kimro."
+<<<<<<< HEAD
+\v 23 Pe om fakir,Yeisi fare enero,"Ahan seprare yanki wapina pe dah wapie yap, ahan am bep ainha yap, pe dah ine bep amkayap. \v 24 Omseki fakir om, dah frare, ahanrohm aham om hatnepy, waina yahpsatne ahankimro omor ahan ine yorahpsepy dahro ahan hatnepy yahpsatne-yahpsatne ahan kimro."
+=======
+\v 23 Pe om fakir,Yeisi fare enero,"Ahan seprare yanki wapina pe dah wapie yap,ahan am bep ainha yap,pe dah ine bep amkayap. \v 24 Omseki fakir om,dah frare,ahanrohm aham om hatnepy,waina yahpsatne ahankimro omor ahan ine yorahpsepy dahro ahan hatnepy yahpsatne-yahpsatne ahan kimro."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/25.txt

@@ -1 +1,5 @@
-\v 25 Omki fenkum enerohm mein ahh,"Yeisi wikina fare enero, dahre weime fohmukir enero?" \v 26 Amroh biap yasap  omar om ahan fakir om dah fare pem haprare, pe omfe kaumermum om dah om yeraam, pe bekeme om dah yirari yap omre om,omor om dah fohmarap om omor om fare yap enfakir bep amrohm." \v 27 En ine hapyose oma Yeisi houmfare deprohom omor Aii ahin fakir.
+<<<<<<< HEAD
+\v 25 Omki fenkum enerohm mein ahh,"Yeisi wikina fare enero, dahre weime fohmukir enero?" \v 26 Amroh biap yasap  omar om ahan fakir om dah fare pem haprare, pe omfe kaumermum om dah om yeraam, pe bekeme om dah yirari yap omre om,omor om dah fohmarap om omor om fare yap enfakir bep amrohm." \v 27 En ine hapyose oma Yeisi houmfare deprohom omor Aii ahin fakir.
+=======
+\v 25 Omki fenkum enerohm mein ahh,"Yeisi wikina fare enero,dahre weime fohmukir enero?" \v 26 Amroh biap yasap  omar om ahan fakir om dah fare pem haprare,pe omfe kaumermum om dah om yeraam ,pe bekeme om dah yirari yap omre om,omor om dah fohmarap om omor om fare yap enfakir bep amrohm." \v 27 En ine hapyose oma Yeisi houmfare deprohom omor Aii ahin fakir.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/28.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 28 Omfakir om, Yeisi fohmum omfe ahn weime hepe wapina raam manusia, taam omkir ahan yirairafiren oma. Dah om pem omki ine raape pahmakin tiep dahre foromarap om am dahro kap nahnem ohona.Omki om dah fare bekeme om waski fhorpy Aii ahre dahro. \v 29 Pem omfe dah kahumarirum om amar dahpis waspahgi, omtepahpsepy ine dah ohonaro, omor rapiyap om itnepki." \v 30 Tenaski Yeisi,fare waspahgi om, biap yanap yirahpsepy omorohm.
 \p
- Bepesie Abrahamhm Pem Bepesie Saitan
+ Bepesie Abrahamhm Pem Bepesie Saitan
+=======
+\v 28 Omfakir om,Yeisi fohmum omfe ahn weime hepe wapina raam manusia,taam omkir ahan yirairafiren oma.dah om pem omki ine raape pahmakin tiep dahre foromarap om am dahro kap nahnem ohona.Omki om dah fare bekeme om waski fhorpy Aii ahre dahro. \v 29 Pem omfe dah kahumarirum om amar dahpis waspahgi,omtepahpsepy ine dah ohonaro,omor rapiyap om itnepki." \v 30 Tenaski Yeisi,fare waspahgi om,biap yanap yirahpsepy omorohm.
+(Bepesie Abrahamhm Pem Bepesie Saitan)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/31.txt

@@ -1 +1,5 @@
-\v 31 Omki,Yeisi fohmum oma yanap Yahudi yirahpsepe-yirahpsepe orohm,"Peahan ira mimi om firman nem rohm, Ahan yeram raam  yoyim dahnem, \v 32 Pem omki ahan yerairafiren yeraraam yap,pem yeraraam om omre birem kosememafaitn ahan." \v 33 En fenkum, dep amar sahmyam Abraham pem ine pahmankin,hamba mein om. Pe bekem fakin fen om, ahan ohoiyare ine?"
+<<<<<<< HEAD
+\v 31 Omki,Yeisi fohmum oma yanap Yahudi yirahpsepe-yirahpsepe orohm,"Peahan ira mimi om firman nem rohm, Ahan yeram raam  yoyim dahnem, \v 32 Pem omki ahan yerairafiren yeraraam yap,pem yeraraam om omre birem kosememafaitn ahan." \v 33 En fenkum, dep amar sahmyam Abraham pem ine pahmankin,hamba mein om. Pe bekem fakin fen om, ahan ohoiyare ine?"
+=======
+\v 31 Omki,Yeisi fohmum oma yanap Yahudi yirahpsepe-yirahpsepe orohm,"Peahan ira mimi om firman nem rohm,Ahan yeram raam  yoyim dahnem, \v 32 Pem omki ahan yerairafiren yeraraam yap,pem yeraraam om omre birem kosememafaitn ahan." \v 33 En fenkum,dep amar sahmyam Abraham pem ine pahmankin,hamba mein om.Pe bekem fakin fen om,ahan ohoiyare ine?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/34.txt

@@ -1 +1,5 @@
-\v 34 Yeisi wikina fohmum,Yeraraam ki, dahrefep anrohm yanap-yanap akin yahpsatne harmesinom om hamba yahpsatne. \v 35 Pahmakin hamba ine mimi waina pahmo keluarga omro waspahgi, rebepasie pahmo mimi kakup waspahgi. \v 36 Pe, omki raap yeptepe ahan, ahan yeramraam,biram kesemafeitn.
+<<<<<<< HEAD
+\v 34 Yeisi wikina fohmum,Yeraraam ki, dahrefep anrohm yanap-yanap akin yahpsatne harmesinom om hamba yahpsatne. \v 35 Pahmakin hamba ine mimi waina pahmo keluarga omro waspahgi, rebepasie pahmo mimi kakup waspahgi. \v 36 Pe, omki raap yeptepe ahan, ahan yeramraam,biram kesemafeitn.
+=======
+\v 34 Yeisi wikina fohmum,Yeraraam ki,dahrefep anrohm yanap-yanap akin yahpsatne harmesinom om hamba yahpsatne. \v 35 Pahmakin hamba ine mimi waina pahmo keluarga omro waspahgi,rebepasie pahmo mimi kakup waspahgi. \v 36 Pe,omki raap yeptepe ahan,ahan yeramraam,biram kesemafeitn.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/37.txt

@@ -1 +1,5 @@
-\v 37 Dahyirari ahan amar sahmyam Abraham am, peahanre wasefakir dah, amar farfurahm dahnem ine hepy mimiahm waina anam omro. \v 38 Dahrae fohmuni ama yasap-yasap om ahan yirari Aii ahnkim ro."
+<<<<<<< HEAD
+\v 37 Dahyirari ahan amar sahmyam Abraham am, peahanre wasefakir dah, amar farfurahm dahnem ine hepy mimiahm waina anam omro. \v 38 Dahrae fohmuni ama yasap-yasap om ahan yirari Aii ahnkim ro."
+=======
+\v 37 Dahyirari ahan amar sahmyam Abraham am,peahanre wasefakir dah,amar farfurahm dahnem ine hepy mimiahm waina anam omro. \v 38 Dahrae fohmuni ama yasap-yasap om ahan yirari Aii ahnkim ro."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/39.txt

@@ -1 +1,5 @@
-\v 39 En wikina wenku enero omrohm. Abraham om omor yirnohm,"Fohmum Yeisi, omfe ahan sahmyaam Abraham anahan ankim frare bekeme om Abraham farkumem om. \v 40 Amar omki, ahan sapu wase fakir dah.Yanap farafur yeraam yap om, om dahre yirare Ar arki. Abraham ine frare yasap om. \v 41 Pe,ahan frare bekeme om Aii ahnkim om ohona en fenkum omrohm, depine menma am hou deia yapki dep hepe om.
+<<<<<<< HEAD
+\v 39 En wikina wenku enero omrohm. Abraham om omor yirnohm,"Fohmum Yeisi, omfe ahan sahmyaam Abraham anahan ankim frare bekeme om Abraham farkumem om. \v 40 Amar omki, ahan sapu wase fakir dah.Yanap farafur yeraam yap om, om dahre yirare Ar arki. Abraham ine frare yasap om. \v 41 Pe,ahan frare bekeme om Aii ahnkim om ohona en fenkum omrohm, depine menma am hou deia yapki dep hepe om.
+=======
+\v 39 En wikina wenku enero omrohm.Abraham om omor yirnohm,"Fohmum Yeisi,omfe ahan sahmyaam Abraham anahan ankim frare bekeme om Abraham farkumem om. \v 40 Amar omki,ahan sapu wase fakir dah.Yanap farafur yeraam yap om,om dahre yirare Ar arki.Abraham ine frare yasap om. \v 41 Pe,ahan frare bekeme om Aii ahnkim om ohona en fenkum omrohm,depine menma am hou deia yapki dep hepe om.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/42.txt

@@ -1 +1,5 @@
-\v 42 Yeisi fohmum om eneroh, pe omfe Ar om yirahkim, ahan om epeahm dahro,omor dah houmuni am omor Ar ahrki, pe dah houmum, amhapte nahnem ohona,om enem waski kaumermum dah. \v 43 Bekem fakin ahan ripahpsepemaam bekeme om dahre fareyap om?Om omor ahan ine yirari raam dahnem. \v 44 Ahan wake hankenom Ai ahnkimgi, yaam omor saitan pem ahan ipopki frare frareyap aiahankim. Om omor wopo nim omor wamyapki pem ine hepekakup yeeraram yaprohm, om omor ine yeraam warohkap enemrohm. Pe omre fare om tepay tepeyap, om fare yap enem worasum enem ohona,nim om omor tepay tepe nim, peyir tepae tepe yap.
+<<<<<<< HEAD
+\v 42 Yeisi fohmum om eneroh, pe omfe Ar om yirahkim, ahan om epeahm dahro,omor dah houmuni am omor Ar ahrki, pe dah houmum, amhapte nahnem ohona,om enem waski kaumermum dah. \v 43 Bekem fakin ahan ripahpsepemaam bekeme om dahre fareyap om?Om omor ahan ine yirari raam dahnem. \v 44 Ahan wake hankenom Ai ahnkimgi, yaam omor saitan pem ahan ipopki frare frareyap aiahankim. Om omor wopo nim omor wamyapki pem ine hepekakup yeeraram yaprohm, om omor ine yeraam warohkap enemrohm. Pe omre fare om tepay tepeyap, om fare yap enem worasum enem ohona,nim om omor tepay tepe nim, peyir tepae tepe yap.
+=======
+\v 42 Yeisi fohmum om eneroh,pe omfe Ar om yirahkim,ahan om epeahm dahro,omor dah houmuni am omor Ar ahrki,pe dah houmum,amhapte nahnem ohona,om enem waski kaumermum dah. \v 43 Bekem fakin ahan ripahpsepemaam bekeme om dahre fareyap om?Om omor ahan ine yirari raam dahnem. \v 44 Ahan wake hankenom Ai ahnkimgi,yaam omor saitan pem ahan ipopki frare frareyap aiahankim.Om omor wopo nim omor wamyapki pem ine hepekakup yeeraram yaprohm,om omor ine yeraam warohkap enemrohm.Pe omre fare om tepay tepeyap,om fare yap enem worasum enem ohona,nim om omor tepay tepe nim,peyir tepae tepe yap.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/45.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 45 Pe, omfakir pe dahre frare yeraraam yap om ahanrohm ahan yirahpsepe dahro. \v 46 Mein om omorohm ahan om hepy fare omki dah yahpsatne? Pe daeh fare yeraraam ya om, tamsekim ahan ine yirahpsepe? \v 47 Brein om woki ararki,om yirari raan Ar Ahm;omor am fakir ahan ine yerairape omor ahan ine Ar arki ine ma ine."
 \p
-Yeisi Roh Farfur Oma Warohm Pem Abraham
+Yeisi Roh Farfur Oma Warohm Pem Abraham
+=======
+\v 45 Pe,omfakir pe dahre frare yeraraam yap om ahanrohm ahan yirahpsepe dahro. \v 46 Mein om omorohm ahan om hepy fare omki dah yahpsatne?Pe daeh fare yeraraam ya om,tamsekim ahan ine yirahpsepe? \v 47 Brein om woki ararki,om yirari raan Ar Ahm;omor am fakir ahan ine yerairape omor ahan ine Ar arki ine ma ine."
+(Yeisi Roh Farfur Oma Warohm Pem Abraham)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/48.txt

@@ -1 +1,5 @@
-\v 48 Yahudi yanap om, fenkum Yeisi ahro,omki fenkum oro yeraamtain omfe depre fare om omfe ahh om Samaria nim pem ahh omki kerasukan saitan ahre?" \v 49 Yeisi wikina fohmum, dah ine nani yanapre yahpe, pe dah ipopki Aii nem ro pe ahan ine ipopki dahro.
+<<<<<<< HEAD
+\v 48 Yahudi yanap om, fenkum Yeisi ahro,omki fenkum oro yeraamtain omfe depre fare om omfe ahh om Samaria nim pem ahh omki kerasukan saitan ahre?" \v 49 Yeisi wikina fohmum, dah ine nani yanapre yahpe, pe dah ipopki Aii nem ro pe ahan ine ipopki dahro.
+=======
+\v 48 Yahudi yanap om ,fenkum Yeisi ahro,omki fenkum oro yeraamtain omfe depre fare om omfe ahh om Samaria nim pem ahh omki kerasukan saitan ahre?" \v 49 Yeisi wikina fohmum,dah ine nani yanapre yahpe,pe dah ipopki Aii nem ro pe ahan ine ipopki dahro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/50.txt

@@ -1 +1,5 @@
-\v 51 \v 50 Pe omfakir, dah ine haa kemuliaan am warohm nem ohona, amar pahmo am haa omki om yaiya.
+<<<<<<< HEAD
+\v 51 \v 50 Pe omfakir, dah ine haa kemuliaan am warohm nem ohona, amar pahmo am haa omki om yaiya.
+=======
+\v 51 \v 50 Pe omfakir,dah ine haa kemuliaan am warohm nem ohona,amar pahmo am haa omki om yaiya.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/54.txt

@@ -1 +1,5 @@
-\v 54 Yeisi fohmum wikina, pedah baitnhose warohm nahnemoh pahmo, kemuliaan nem om ine rape toupmaam; Ai Are ekam muliakan hapmfeitn dah,om omor enem ahan fare, om amar yiir nohm." \v 55 Omfe, ahan yirari mam om, pedah daiteep om,pe omfe dahre fare omfe dah ine daiteyepe, om war hepe nimai rare, omor ahan paski pe da daiteyepe om, pem dah ipopki firman enem. \v 56 Yir ahankim Abraham,ohou enemoup omor om sahpum taam nahnem, om weime sahpum pem ohou enemoup.
+<<<<<<< HEAD
+\v 54 Yeisi fohmum wikina, pedah baitnhose warohm nahnemoh pahmo, kemuliaan nem om ine rape toupmaam; Ai Are ekam muliakan hapmfeitn dah,om omor enem ahan fare, om amar yiir nohm." \v 55 Omfe, ahan yirari mam om, pedah daiteep om,pe omfe dahre fare omfe dah ine daiteyepe, om war hepe nimai rare, omor ahan paski pe da daiteyepe om, pem dah ipopki firman enem. \v 56 Yir ahankim Abraham,ohou enemoup omor om sahpum taam nahnem, om weime sahpum pem ohou enemoup.
+=======
+\v 54 Yeisi fohmum wikina,pedah baitnhose warohm nahnemoh pahmo,kemuliaan nem om ine rape toupmaam;Ai Are ekam muliakan hapmfeitn dah,om omor enem ahan fare,om amar yiir nohm." \v 55 Omfe,ahan yirari mam om,pedah daiteep om,pe omfe dahre fare omfe dah ine daiteyepe, om war hepe nimai rare,omor ahan paski pe da daiteyepe om,pem dah ipopki firman enem. \v 56 Yir ahankim Abraham,ohou enemoup omor om sahpum taam nahnem,om weime sahpum pem ohou enemoup.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

08/57.txt

@@ -1 +1,5 @@
-\v 57 Omki yahudi yanap, om fenkum omoroh, umur ahnkim waam ine 50 tahun, omfe ahan weime sapenkenon Abraham ahin?" \v 58 Yeisi fohmum enero,amarohm, dah weimeki Amar, weimeki Abraham maamki, aarohm dah weimeki amar. \v 59 Amae am, en hepy houa om tesharpy om, pe Yeisi sapuheitemum,pem temahm semamum Bait Allah.
+<<<<<<< HEAD
+\v 57 Omki yahudi yanap, om fenkum omoroh, umur ahnkim waam ine 50 tahun, omfe ahan weime sapenkenon Abraham ahin?" \v 58 Yeisi fohmum enero,amarohm, dah weimeki Amar, weimeki Abraham maamki, aarohm dah weimeki amar. \v 59 Amae am, en hepy houa om tesharpy om, pe Yeisi sapuheitemum,pem temahm semamum Bait Allah.
+=======
+\v 57 Omki yahudi yanap,om fenkum omoroh,umur ahnkim waam ine 50 tahun,omfe ahan weime sapenkenon Abraham ahin?" \v 58 Yeisi fohmum enero,amarohm,dah weimeki Amar,weimeki Abraham maamki,aarohm dah weimeki amar. \v 59 Amae am,en hepy houa om tesharpy om,pe Yeisi sapuheitemum,pem temahm semamum Bait Allah.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/01.txt

@@ -1 +1,5 @@
-\c 9 \v 1 Amtegim oum Yeisi ahin yapu kap mani sepe pre oumigi oum fani nim toup satne ein kapgi houm num. \v 2 Yanap-yanap Yeisi am rouk asip sasharpe,"Pas trere nim mein oum ou ohom nim amin ten ounou jir tein dum fagi ahi argum?"
+<<<<<<< HEAD
+\c 9 \v 1 Amtegim oum Yeisi ahin yapu kap mani sepe pre oumigi oum fani nim toup satne ein kapgi houm num. \v 2 Yanap-yanap Yeisi am rouk asip sasharpe,"Pas trere nim mein oum ou ohom nim amin ten ounou jir tein dum fagi ahi argum?"
+=======
+\c 9 \v 1 (Amtegim oum Yeisi ahin yapu kap mani sepe pre oumigi oum fani nim toup satne ein kapgi houm num. \v 2 Yanap-yanap Yeisi am rouk asip sasharpe,"Pas trere nim mein oum ou ohom nim amin ten ounou jir tein dum fagi ahi argum?"
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/03.txt

@@ -1 +1,5 @@
-\v 3 Jeisi ahin boup asip fei pas harpe yanap enemrouk"oumtegi ene oum fani nim amin tein ou nou jir tem pre en waspahgi mmir-mimir frare Ar Ahai rare wanaoruok. \v 4 Deep mimiam heepe mimir-mimir frare enem waapginarouk darouk heimoum taam gi waspahgi, sigidaak yanap mimir mamgi. \v 5 Daak yapu kaap rouk hounukumni"Daar ar taam sigianeh, taam jari nim."
+<<<<<<< HEAD
+\v 3 Jeisi ahin boup asip fei pas harpe yanap enemrouk"oumtegi ene oum fani nim amin tein ou nou jir tem pre en waspahgi mmir-mimir frare Ar Ahai rare wanaoruok. \v 4 Deep mimiam heepe mimir-mimir frare enem waapginarouk darouk heimoum taam gi waspahgi, sigidaak yanap mimir mamgi. \v 5 Daak yapu kaap rouk hounukumni"Daar ar taam sigianeh, taam jari nim."
+=======
+\v 3 Jeisi ahin boup asip fei pas harpe yanap enemrouk"oumtegi ene oum fani nim amin tein ou nou jir tem pre en waspahgi mmir-mimir frare Ar Ahai rare wanaoruok. \v 4 Deep mimiam heepe mimir-mimir frare enem waapginarouk darouk heimoum taam gi waspahgi,sigidaak yanap mimir mamgi. \v 5 Daak yapu kaap rouk hounukumni"Daar ar taam sigianeh,taam jari nim."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/06.txt

@@ -1 +1,5 @@
-\v 6 Preoumi gi oumpa fare oum, Jeisi ahim utuku pem kouse bee prouh hafwarere pamorouk tousatne sam faninim oumrouk. \v 7 Rouki asip yaap fare oumrouk,"Soum weferemaam saam fare oumrouk. Ouhtanam"Frare naimaap ram"Nim ouh sepe,weigi eina saam naimap ram.
+<<<<<<< HEAD
+\v 6 Preoumi gi oumpa fare oum, Jeisi ahim utuku pem kouse bee prouh hafwarere pamorouk tousatne sam faninim oumrouk. \v 7 Rouki asip yaap fare oumrouk,"Soum weferemaam saam fare oumrouk. Ouhtanam"Frare naimaap ram"Nim ouh sepe,weigi eina saam naimap ram.
+=======
+\v 6 Preoumi gi oumpa fare oum,Jeisi ahim utuku pem kouse bee prouh hafwarere pamorouk tousatne sam faninim oumrouk. \v 7 Rouki asip yaap fare oumrouk,"Soum weferemaam saam fare oumrouk.Ouhtanam"Frare naimaap ram"Nim ouh sepe,weigi eina saam naimap ram.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/08.txt

@@ -1 +1,5 @@
-\v 8 Yanap jojim ounoup jim sapae maam oum fare mani pasgi,"Amin tein hamin kap rouk yeh teim megi keih foumarkum?" \v 9 Yanap roukoboup farpur, be amar ar keinim tanam oumur,"Pre yanap frare"ah oum einne pemer auh, sami paam umis auh keinim hamikap foumarkum ni.
+<<<<<<< HEAD
+\v 8 Yanap jojim ounoup jim sapae maam oum fare mani pasgi,"Amin tein hamin kap rouk yeh teim megi keih foumarkum?" \v 9 Yanap roukoboup farpur, be amar ar keinim tanam oumur,"Pre yanap frare"ah oum einne pemer auh, sami paam umis auh keinim hamikap foumarkum ni.
+=======
+\v 8 Yanap jojim ounoup jim sapae maam oum fare mani pasgi,"Amin tein hamin kap rouk yeh teim megi keih foumarkum?" \v 9 Yanap roukoboup farpur,be amar ar keinim tanam oumur,"Pre yanap frare"ah oum einne pemer auh,sami paam umis auh keinim hamikap foumarkum ni.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/10.txt

@@ -1 +1,5 @@
-\v 10 Pre tamsegin saam anam oum pah rare?" \v 11 Nim oum rouk asip farupur"Yanap nim na enem oum jeisi ar beep harpaan am haap warre oukupis pamorouk sam denem rouk tousatne daak oumigi oum rouk farfur feep amar"sum ar wareni farem tareak oumrouk sam fenam ar ak oumigi saipan ar. \v 12 Enre fare tam roukein yanap om?"Oumfre fare daak jirari eine tam roukein.
+<<<<<<< HEAD
+\v 10 Pre tamsegin saam anam oum pah rare?" \v 11 Nim oum rouk asip farupur"Yanap nim na enem oum jeisi ar beep harpaan am haap warre oukupis pamorouk sam denem rouk tousatne daak oumigi oum rouk farfur feep amar"sum ar wareni farem tareak oumrouk sam fenam ar ak oumigi saipan ar. \v 12 Enre fare tam roukein yanap om?"Oumfre fare daak jirari eine tam roukein.
+=======
+\v 10 Pre tamsegin saam anam oum pah rare?" \v 11 Nim oum rouk asip farupur"Yanap/nim na enem oum jeisi ar beep harpaan am haap warre oukupis pamorouk sam denem rouk tousatne daak oumigi oum rouk farfur feep amar"sum ar wareni farem tareak oumrouk sam fenam ar ak oumigi saipan ar. \v 12 Enre fare tam roukein yanap om?"Oumfre fare daak jirari eine tam roukein.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/13.txt

@@ -1 +1,5 @@
-\v 13 Enere oumigi yasempesaim fani nim oum Farisi yanap rouk. \v 14 Fani nim saam bait osagum oum taam tapir gi. \v 15 Yanap-yanap Farisi ouraru fare fani nim oumrouk tam pasgi ak saam sapae. Fani nim oumre fare saam beep harpam ukupis yawar kousem haapmegi saam danemrouk toum sapu um farem rouk saam femakumni dak saam umigipah arukumni.
+<<<<<<< HEAD
+\v 13 Enere oumigi yasempesaim fani nim oum Farisi yanap rouk. \v 14 Fani nim saam bait osagum oum taam tapir gi. \v 15 Yanap-yanap Farisi ouraru fare fani nim oumrouk tam pasgi ak saam sapae. Fani nim oumre fare saam beep harpam ukupis yawar kousem haapmegi saam danemrouk toum sapu um farem rouk saam femakumni dak saam umigipah arukumni.
+=======
+\v 13 Enere oumigi yasempesaim fani nim oum Farisi yanap rouk. \v 14 Fani nim saam bait osagum oum taam tapir gi. \v 15 Yanap-yanap Farisi ouraru fare fani nim oumrouk tam pasgi ak saam sapae.Fani nim oumre fare saam beep harpam ukupis yawar kousem haapmegi saam danemrouk toum sapu um farem rouk saam femakumni dak saam umigipah arukumni.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/19.txt

@@ -1 +1,5 @@
-\v 19 Enrouk rouk boup tar harpe, am raap amnigimtein, wei weimigi fani wanigi kaumkapgi houm oumintein? Pre oumigi oum bekem fagin amtegi raap saam enen saapae?" \v 20 Ohnou jir rouk asip kaf fare enrouk, deep jirari pre oum raap douh poum pre weimegi raap douh poum fani menkemim, \v 21 pre amtagi oum bekem fagin raap anigim oum sapae, deep jirari eine, mame pre saam pahrare deip jirari eine. Rouk boup asip fenim ekem rouh, ekam pasgim miniram:Ekaam rouk farum saipein warum kaap enerouh waneina.
+<<<<<<< HEAD
+\v 19 Enrouk rouk boup tar harpe, am raap amnigimtein, wei weimigi fani wanigi kaumkapgi houm oumintein? Pre oumigi oum bekem fagin amtegi raap saam enen saapae?" \v 20 Ohnou jir rouk asip kaf fare enrouk, deep jirari pre oum raap douh poum pre weimegi raap douh poum fani menkemim, \v 21 pre amtagi oum bekem fagin raap anigim oum sapae, deep jirari eine, mame pre saam pahrare deip jirari eine. Rouk boup asip fenim ekem rouh, ekam pasgim miniram:Ekaam rouk farum saipein warum kaap enerouh waneina.
+=======
+\v 19 Enrouk rouk boup tar harpe,am raap amnigimtein,wei weimigi fani wanigi kaumkapgi houm oumintein? Pre oumigi oum bekem fagin amtegi raap saam enen saapae?" \v 20 Ohnou jir rouk asip kaf fare enrouk,deep jirari pre oum raap douh poum pre weimegi raap douh poum fani menkemim, \v 21 pre amtagi oum bekem fagin raap anigim oum sapae,deep jirari eine,mame pre saam pahrare deip jirari eine.Rouk boup asip fenim ekem rouh,ekam pasgim miniram:Ekaam rouk farum saipein warum kaap enerouh waneina.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/22.txt

@@ -1 +1,5 @@
-\v 22 Ouh jir re rouh oumpasgi fare pere kaap enerouh entouh kargi Yahudi yanap-yanap oum rouh. Preh Yahudi yanap-yanap trimaap en rouk haapteh,am tegim amtegim amte are yaap jeisi ahin tuan, ar are yaap sapae frifip. \v 23 Umigi oum preh rouh asip fare fagi,"oum raap deep poum oum nimram rouk fenim ekam rouh waina-waina.
+<<<<<<< HEAD
+\v 22 Ouh jir re rouh oumpasgi fare pere kaap enerouh entouh kargi Yahudi yanap-yanap oum rouh. Preh Yahudi yanap-yanap trimaap en rouk haapteh,am tegim amtegim amte are yaap jeisi ahin tuan, ar are yaap sapae frifip. \v 23 Umigi oum preh rouh asip fare fagi,"oum raap deep poum oum nimram rouk fenim ekam rouh waina-waina.
+=======
+\v 22 Ouh jir re rouh oumpasgi fare pere kaap enerouh entouh kargi Yahudi yanap-yanap oum rouh.Preh Yahudi yanap-yanap trimaap en rouk haapteh,am tegim amtegim amte are yaap jeisi ahin tuan,ar are yaap sapae frifip. \v 23 Umigi oum preh rouh asip fare fagi,"oum raap deep poum oum nimram rouk fenim ekam rouh waina-waina.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/24.txt

@@ -1 +1,5 @@
-\v 24 Deep, am uraroh toisgi rep anrouk Yahudi yanap-yanap toyaape yanap fani yanap oum, en rouk boup asip taatnes harpe,"Ouhu Ar, ar rouk farare deep oumgi pre yanap tepaetepi, ohoum nimi." \v 25 Pre rouk boup asip teipons harpeh,yeram tein yanap oum ohoum yanap tein dak am jirari einne rouh pamouk ram daak jirari weimegi daak fani mamigi pre amtegim oum daak sarap."
+<<<<<<< HEAD
+\v 24 Deep, am uraroh toisgi rep anrouk Yahudi yanap-yanap toyaape yanap fani yanap oum, en rouk boup asip taatnes harpe,"Ouhu Ar, ar rouk farare deep oumgi pre yanap tepaetepi, ohoum nimi." \v 25 Pre rouk boup asip teipons harpeh,yeram tein yanap oum ohoum yanap tein dak am jirari einne rouh pamouk ram daak jirari weimegi daak fani mamigi pre amtegim oum daak sarap."
+=======
+\v 24 Deep,am uraroh toisgi rep anrouk Yahudi yanap-yanap toyaape yanap fani yanap oum,en rouk boup asip taatnes harpe,"Ouhu Ar,ar rouk farare deep oumgi pre yanap tepaetepi,ohoum nimi." \v 25 Pre rouk boup asip teipons harpeh,yeram tein yanap oum ohoum yanap tein dak am jirari einne rouh pamouk ram daak jirari weimegi daak fani mamigi pre amtegim oum daak sarap."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/26.txt

@@ -1 +1,5 @@
-\v 26 Onre rouk fipos harpe, oumre arouh bekeme farkum? Tam segim saam anam oum parare? \v 27 Oum re rouh boup fipos harpe,"Dare aruk rouk asip fipam heimuni pre an touh raam rouh asip danem am, bekem fagin ahan amtegin jirari sitein? Ahan pasgini yanap rare fagin tein?
+<<<<<<< HEAD
+\v 26 Onre rouk fipos harpe, oumre arouh bekeme farkum? Tam segim saam anam oum parare? \v 27 Oum re rouh boup fipos harpe,"Dare aruk rouk asip fipam heimuni pre an touh raam rouh asip danem am, bekem fagin ahan amtegin jirari sitein? Ahan pasgini yanap rare fagin tein?
+=======
+\v 26 Onre rouk fipos harpe,oumre arouh bekeme farkum?Tam segim saam anam oum parare? \v 27 Oum re rouh boup fipos harpe,"Dare aruk rouk asip fipam heimuni pre an touh raam rouh asip danem am,bekem fagin ahan amtegin jirari sitein?Ahan pasgini yanap rare fagin tein?
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/32.txt

@@ -1 +1,5 @@
-\v 32 Weimigi yanap amtegin pasgi fani are yasep deep wanigina kahukap gi are yasep. \v 33 Pre yanap ohum ane ram Ar ahgi inma eineram oum ouhm ahan raam. \v 34 Yahudi yanap-yanap ouhum rouk boup asip farupur, ahan wagina ohumou anigin menma ouhum ram an oumin deep rouk yaaffarefagin?"Oum en kammari wagina fani nim ohum.
+<<<<<<< HEAD
+\v 32 Weimigi yanap amtegin pasgi fani are yasep deep wanigina kahukap gi are yasep. \v 33 Pre yanap ohum ane ram Ar ahgi inma eineram oum ouhm ahan raam. \v 34 Yahudi yanap-yanap ouhum rouk boup asip farupur, ahan wagina ohumou anigin menma ouhum ram an oumin deep rouk yaaffarefagin?"Oum en kammari wagina fani nim ohum.
+=======
+\v 32 Weimigi yanap amtegin pasgi fani are yasep deep wanigina kahukap gi are yasep. \v 33 Pre yanap ohum ane ram Ar ahgi inma eineram oum ouhm ahan raam. \v 34 Yahudi yanap-yanap ouhum rouk boup asip farupur,ahan wagina ohumou anigin menma ouhum ram an oumin deep rouk yaaffarefagin?"Oum en kammari wagina fani nim ohum.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

09/39.txt

@@ -1 +1,5 @@
-\v 39 Jeisi ahain pouk fare,"Oumgi oum daak yapu amrouh houmuni oumnbernein sapae maam yanap sapae fagir sapae yanap faniai rare fagir. \v 40 Farisi yanap oumrouk tarmounkum oum jirari gum,rouk fare,"Pre deep am fanitein?" \v 41 Jeisi ahin rouk boup asip foupos harpe,"Pre ahan fani, an eineram  yapsatne eine, pre ahan rouk boup asip yaaf fare'Deep sahpae yapsatne oum ropein."
+<<<<<<< HEAD
+\v 39 Jeisi ahain pouk fare,"Oumgi oum daak yapu amrouh houmuni oumnbernein sapae maam yanap sapae fagir sapae yanap faniai rare fagir. \v 40 Farisi yanap oumrouk tarmounkum oum jirari gum,rouk fare,"Pre deep am fanitein?" \v 41 Jeisi ahin rouk boup asip foupos harpe,"Pre ahan fani, an eineram  yapsatne eine, pre ahan rouk boup asip yaaf fare'Deep sahpae yapsatne oum ropein."
+=======
+\v 39 Jeisi ahain pouk fare,"Oumgi oum daak yapu amrouh houmuni oumnbernein sapae maam yanap sapae fagir sapae yanap faniai rare fagir. \v 40 Farisi yanap oumrouk tarmounkum oum jirari gum,rouk fare,"Pre deep am fanitein?" \v 41 Jeisi ahin rouk boup asip foupos harpe,"Pre ahan fani,an eineram  yapsatne eine,pre ahan rouk boup asip yaaf fare'Deep sahpae yapsatne oum ropein."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/01.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \c 10 \s 
 Yeisi Gembala Am Naimap 
-\p \v 1 Yeisi fohmum, am yera raamki,  dahre feb Am ahanro, yanap am yepy waina kandang damba omroh  om ine enmoup ri yepe  maam, omkiom  yepe waski teiyep yep hamin pemke. yanap omoum daike. \v 2 Pe omki, yanap yepe enmoup raamki, nim oum omet Gembala Domba enem omkakar enmoup rohim tatne enemoup, omki domba-domba enem om yirari rohmoup enem, pem omki foyahpy domba domba enem amna enkem ohana, omki kakahp sepy enn wahirro.
+\p \v 1 Yeisi fohmum, am yera raamki,  dahre feb Am ahanro, yanap am yepy waina kandang damba omroh  om ine enmoup ri yepe  maam, omkiom  yepe waski teiyep yep hamin pemke. yanap omoum daike. \v 2 Pe omki, yanap yepe enmoup raamki, nim oum omet Gembala Domba enem omkakar enmoup rohim tatne enemoup, omki domba-domba enem om yirari rohmoup enem, pem omki foyahpy domba domba enem amna enkem ohana, omki kakahp sepy enn wahirro.
+=======
+\c 10 (YEISI GEMBALA AM NAIMAP) \v 1 Yeisi fohmum, am yera raamki,  dahre feb Am ahanro, yanap am yepy waina kandang damba omroh  om ine enmoup ri yepe  maam, omkiom  yepe waski teiyep yep hamin pemke. yanap omoum daike. \v 2 Pe omki, yanap yepe enmoup raamki, nim oum omet Gembala Domba
+ enem omkakar enmoup rohim tatne enemoup, omki domba-domba enem om yirari rohmoup enem, pem omki foyahpy domba domba enem amna enkem ohana, omki kakahp sepy enn wahirro.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/07.txt

@@ -1 +1,5 @@
-\v 7 Omot Omseki am Yeisi urah fare om enero, Yeroram  yapro, dahre feifop ahanre, Dah enemoup wai domba domba omra, \v 8 Waspagi yanaap oum honfitn oum dah mamki om omor duki yanaap. Pe, yashepy ya nap, pe omki domba-domba ine yirari enero.
+<<<<<<< HEAD
+\v 7 Omot Omseki am Yeisi urah fare om enero, Yeroram  yapro, dahre feifop ahanre, Dah enemoup wai domba domba omra, \v 8 Waspagi yanaap oum honfitn oum dah mamki om omor duki yanaap. Pe, yashepy ya nap, pe omki domba-domba ine yirari enero.
+=======
+\v 7 Omot Omseki am Yeisi urah fare om enero, Yeroram  yapro, dahre feifop ahanre, Dah enemoup wai domba domba omra, \v 8 Waspagi yanaap oum honfitn oum dah mamki om omor duki yanaap. pe, yashepy ya nap, pe omki domba-domba ine yirari enero.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/17.txt

@@ -1 +1,5 @@
-\v 17 Omar omfakir, Ai ain epeah tanam dahro, omki dahte har pakepop asip hor nahnem,  omor dah hepy dekanuh. \v 18 Ine Pahmakim hepy dahrki, omki omor, dahre harpy omar hapy yose kaap dahnemke ohana. Dah Am konom yap enem apintna  harpy asip hoor dah nem, omki dah pahm sekim  apintna konom yap am ura dekana hepy urah. Amar maurtip am Dah hepakumuni mouni pam dahre nepakumui Ai dahnem.
+<<<<<<< HEAD
+\v 17 Omar omfakir, Ai ain epeah tanam dahro, omki dahte har pakepop asip hor nahnem,  omor dah hepy dekanuh. \v 18 Ine Pahmakim hepy dahrki, omki omor, dahre harpy omar hapy yose kaap dahnemke ohana. Dah Am konom yap enem apintna  harpy asip hoor dah nem, omki dah pahm sekim  apintna konom yap am ura dekana hepy urah. Amar maurtip am Dah hepakumuni mouni pam dahre nepakumui Ai dahnem.
+=======
+\v 17 Omar omfakir, Ai ain epeah tanam dahro, omki dahte har pakepop asip hor nahnem,  omor dah hepy dekanuh. \v 18 Ine Pahmakim hepy dahrki, omki omor, dahre harpy omar hapy yose kaap dahnemke ohana. Dah Am konom yap enem apintna  harpy asip hoor dah nem, omki dah pahm sekim  apintna konom yap am ura dekana hepy urah. amar maurtip am Dah hepakumuni mouni pam dahre nepakumui Ai dahnem.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/19.txt

@@ -1,2 +1,7 @@
 \v 19 pahmo Ura amar taruru yap amor Yahudi Yanap Omar Roh moup Yeisi Om. \v 20 Biap ama enerefare, Oma, oma nanire yaiamnem omki ouhmai artana bekem fakin aham yirari omro?" \v 21 pemomfare, " om ine Roh moup om yanap nanire yirari yapse yap ompaski ine, hepatain Rohataman om Prarare sahmfani?"
-\s Yeisi pemAii om Pahmo
+<<<<<<< HEAD
+\s Yeisi pemAii om Pahmo
+=======
+
+( YEISI PEM AII OM PAHMO)
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/25.txt

@@ -1 +1,5 @@
-\v 25 Yeisi fohmum enero, Dah weime fohmetop ahan ro, pe omki ahan ine yirahp sepy. Karya tiep karya tiep dahre frare yap om omor waine Naaiahamro, omor omre harpafeitn sapae yam om dah fatir. \v 26 Omar omkiom ahan ine yirahpsepy, omor ahan ine yepy domba-domba nemra.
+<<<<<<< HEAD
+\v 25 Yeisi fohmum enero, Dah weime fohmetop ahan ro, pe omki ahan ine yirahp sepy. Karya tiep karya tiep dahre frare yap om omor waine Naaiahamro, omor omre harpafeitn sapae yam om dah fatir. \v 26 Omar omkiom ahan ine yirahpsepy, omor ahan ine yepy domba-domba nemra.
+=======
+\v 25 Yeisi fohmum enero, Dah weime fohmetop ahan ro, pe omki ahan ine yirahp sepy. karya tiep karya tiep dahre frare yap om omor waine Naaiahamro, omor omre harpafeitn sapae yam om dah fatir. \v 26 Omar omkiom ahan ine yirahpsepy, omor ahan ine yepy domba-domba nemra.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

10/32.txt

@@ -1 +1,5 @@
-\v 32 Pe omki Yeisi fohmum om enero, " Hame weime fohr pakumuni. Ahan Roh biap karia yap naimap om Aii ahre, Karia Ahm Tamin om, Oma baitn hose omki teisapeh ohh houp?" \v 33 Yahudi Yanaap  om fare, " omro  ine om pahmokan yap naimap dep omki tes harpy ah hou aki, om omor henma pem omor ahh fakir, omor nim pahmo, aiitnatan warohnamam ar ahain."
+<<<<<<< HEAD
+\v 32 Pe omki Yeisi fohmum om enero, " Hame weime fohr pakumuni. Ahan Roh biap karia yap naimap om Aii ahre, Karia Ahm Tamin om, Oma baitn hose omki teisapeh ohh houp?" \v 33 Yahudi Yanaap  om fare, " omro  ine om pahmokan yap naimap dep omki tes harpy ah hou aki, om omor henma pem omor ahh fakir, omor nim pahmo, aiitnatan warohnamam ar ahain."
+=======
+\v 32 Pe omki Yeisi fohmum om enero, " Hame weime fohr pakumuni. ahan Roh biap karia yap naimap om Aii ahre, Karia Ahm Tamin om, Oma baitn hose omki teisapeh ohh houp?" \v 33 Yahudi Yanaap  om fare, " omro  ine om pahmokan yap naimap dep omki tes harpy ah hou aki, om omor henma pem omor ahh fakir, omor nim pahmo, aiitnatan warohnamam ar ahain."
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/01.txt

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 \c 11 \s 
 Lazarus Hatnoum
-\p \v 1 Nim pamouk naenem oum Lazarus, yaruru nim yapu na enem oum Betania, yasep yapu Maria pre ounum jim Marta ah am. \v 2 Mari ocemur ar douh oumre oumrim kapim apir Jeisi aham oum umigi toumpupinsgi riri haapmagim, enaim wasinou Lazarus saam pre oumugi ohum hamoum Lazarus ain.
+\p \v 1 Nim pamouk naenem oum Lazarus, yaruru nim yapu na enem oum Betania, yasep yapu Maria pre ounum jim Marta ah am. \v 2 Mari ocemur ar douh oumre oumrim kapim apir Jeisi aham oum umigi toumpupinsgi riri haapmagim, enaim wasinou Lazarus saam pre oumugi ohum hamoum Lazarus ain.
+=======
+\c 11 (Lazarus Hatnoum) \v 1 Nim pamouk naenem oum Lazarus,yaruru nim yapu na enem oum Betania,yasep yapu Maria pre ounum jim Marta ah am. \v 2 Mari ocemur ar douh oumre oumrim kapim apir Jeisi aham oum umigi toumpupinsgi riri haapmagim,enaim wasinou Lazarus saam pre oumugi ohum hamoum Lazarusain.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/03.txt

@@ -1 +1,5 @@
-\v 3 Pre, wasipep toisgi oum  rouk boub asip taat'ns harpe oum rouk, rouk fare" Tuan nim are heimim oum hamoum faroumin. \v 4 Pre raan teima oum jirimoum Jeisi ahain,rouk fouk mum boupose oum eineraam hadnepe, fare ar ouhu enetanain Ar arrouk oumigi raap oum Ar amar ar ouhu enefare yanap.
+<<<<<<< HEAD
+\v 3 Pre, wasipep toisgi oum  rouk boub asip taat'ns harpe oum rouk, rouk fare" Tuan nim are heimim oum hamoum faroumin. \v 4 Pre raan teima oum jirimoum Jeisi ahain,rouk fouk mum boupose oum eineraam hadnepe, fare ar ouhu enetanain Ar arrouk oumigi raap oum Ar amar ar ouhu enefare yanap.
+=======
+\v 3 Pre,wasipep toisgi oum  rouk boub asip taat'ns harpe oum rouk,rouk fare" Tuan nim are heimim oum hamoum faroumin. \v 4 Pre raan teima oum jirimoum Jeisi ahain,rouk fouk mum boupose oum eineraam hadnepe,fare ar ouhu enetanain Ar arrouk oumigi raap oum Ar amar ar ouhu enefare yanap.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/05.txt

@@ -1 +1,5 @@
-\v 5 Jeisi ahm yeram Marta enaim Lazarus am. \v 6 Pre oumigi oum Jeisi ahim boup asip jirari Lazarus ahm hamoum. Oum tepae teipe taam toisgi rare hounukum oum rouk. \v 7 Pre oumigi oum, Jeisi ahin rouk fare yahanap-yahanap rouk,"eisepe deip Yudea yapurrouk".
+<<<<<<< HEAD
+\v 5 Jeisi ahm yeram Marta enaim Lazarus am. \v 6 Pre oumigi oum Jeisi ahim boup asip jirari Lazarus ahm hamoum. Oum tepae teipe taam toisgi rare hounukum oum rouk. \v 7 Pre oumigi oum, Jeisi ahin rouk fare yahanap-yahanap rouk,"eisepe deip Yudea yapurrouk".
+=======
+\v 5 Jeisi ahm yeram Marta enaim Lazarus am. \v 6 Pre oumigi oum Jeisi ahim boup asip jirari Lazarus ahm hamoum. oum tepae teipe taam toisgi rare hounukum oum rouk. \v 7 Pre oumigi oum,Jeisi ahin rouk fare yahanap-yahanap rouk,"eisepe deip Yudea yapurrouk".
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/10.txt

@@ -1 +1,5 @@
-\v 10 Pre oum yana eina weina ohum. isigi, kipiram inma touh pre oumur oumigi oum taamgi ene fagi. \v 11 Pre Jeisi ahim fareoum,rouk boup asip fare enroule " Yahanap doum Lazarus ahin apusani pre daak ahipop ar oumrouk woi teh ouh.
+<<<<<<< HEAD
+\v 10 Pre oum yana eina weina ohum. isigi, kipiram inma touh pre oumur oumigi oum taamgi ene fagi. \v 11 Pre Jeisi ahim fareoum,rouk boup asip fare enroule " Yahanap doum Lazarus ahin apusani pre daak ahipop ar oumrouk woi teh ouh.
+=======
+\v 10 pre oum yana eina weina ohum. isigi,kipiram inma touh pre oumur oumigi oum taamgi ene fagi. \v 11 Pre Jeisi ahim fareoum,rouk boup asip fare enroule " Yahanap doum Lazarus ahin apusani pre daak ahipop ar oumrouk woi teh ouh.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/12.txt

@@ -1 +1,5 @@
-\v 12 Yahana-yahana enre rouk farupur " Tuhan, pre apusaam rumur taam pasgi remaipen,tein." \v 13 Jeisi ahin roukboup asip farupur am hadnepe yasep Lazarus, ahin pre yahanap-yahanap re semamegi deip rouk hramegi pre apusam oum pemerboup asip hadnepe. \v 14 Pre oum, Jeisi ahin roukfare jeram yasep enrouk,"Lazarus ahim hadneren,
+<<<<<<< HEAD
+\v 12 Yahana-yahana enre rouk farupur " Tuhan, pre apusaam rumur taam pasgi remaipen,tein." \v 13 Jeisi ahin roukboup asip farupur am hadnepe yasep Lazarus, ahin pre yahanap-yahanap re semamegi deip rouk hramegi pre apusam oum pemerboup asip hadnepe. \v 14 Pre oum, Jeisi ahin roukfare jeram yasep enrouk,"Lazarus ahim hadneren,
+=======
+\v 12 Yahana-yahana enre rouk farupur " Tuhan,pre apusaam rumur taam pasgi remaipen,tein." \v 13 Jeisi ahin roukboup asip farupur am hadnepe yasep Lazarus,ahin pre yahanap-yahanap re semamegi deip rouk hramegi pre apusam oum pemerboup asip hadnepe. \v 14 Pre oum,Jeisi ahin roukfare jeram yasep enrouk,"Lazarus ahim hadneren,
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/15.txt

@@ -1 +1,5 @@
-\v 15 Oumig: oumdaak am ouhunyar eine warum daak oum rouh warna inma eine pre an darouk jirap sepe fagi. Pre ein somore oum roule woipesaip. \v 16 Pre oum, na Tomas na pem oum Didimus rouk boup asip yaaf fare yahanap yahanap pre, rouk ei deep pesaapip deip pasgim hadne pe fagir yahanap doum pis.
+<<<<<<< HEAD
+\v 15 Oumig: oumdaak am ouhunyar eine warum daak oum rouh warna inma eine pre an darouk jirap sepe fagi. Pre ein somore oum roule woipesaip. \v 16 Pre oum, na Tomas na pem oum Didimus rouk boup asip yaaf fare yahanap yahanap pre, rouk ei deep pesaapip deip pasgim hadne pe fagir yahanap doum pis.
+=======
+\v 15 Oumig: oumdaak am ouhunyar eine warum daak oum rouh warna inma eine pre an darouk jirap sepe fagi. Pre ein somore oum roule woipesaip. \v 16 Pre oum,na Tomas na pem oum Didimus rouk boup asip yaaf fare yahanap yahanap pre, rouk ei deep pesaapip deip pasgim hadne pe fagir yahanap doum pis.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/21.txt

@@ -1 +1,5 @@
-\v 21 Marta rouk boup asip fare Jeisi aroule " Tuhan taam umgi aham rouk rausar, enaim danem hadnepe eine heram. \v 22 Dak jirari preuom aintegim tam pasgin oum ak kei fare Ar arouk. Ar are heipein arouk. \v 23 Jeisi ahin rouk boup asip fare enaim anam oum remteipen.
+<<<<<<< HEAD
+\v 21 Marta rouk boup asip fare Jeisi aroule " Tuhan taam umgi aham rouk rausar, enaim danem hadnepe eine heram. \v 22 Dak jirari preuom aintegim tam pasgin oum ak kei fare Ar arouk. Ar are heipein arouk. \v 23 Jeisi ahin rouk boup asip fare enaim anam oum remteipen.
+=======
+\v 21 Marta rouk boup asip fare Jeisi aroule " Tuhan taam umgi aham rouk rausar,enaim danem hadnepe eine heram. \v 22 Dak jirari preuom aintegim tam pasgin oum ak kei fare Ar arouk. Ar are heipein arouk. \v 23 Jeisi ahin rouk boup asip fare enaim anam oum remteipen.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/27.txt

@@ -1 +1,6 @@
-\v 27 Marta rouk fiposharpe " Pre Tuhan daak arouk jirap mini se ar Tuhan raap Ar, aham yapu tapur houp daapnae amruk houm." Jeisi Ahin Diir Ferare \v 28 Rouk fare rouk boup asip oum,Marta ahin sepe foyaape Maria ahin, enaim, rouk yaaf fare ouna rouk," pas tre re nim amrouk houae ak foyaape." \v 29 Rouk boup asip oum jirari mari ahin oumigi sepe Jeisi arouk.
+<<<<<<< HEAD
+\v 27 Marta rouk fiposharpe " Pre Tuhan daak arouk jirap mini se ar Tuhan raap Ar, aham yapu tapur houp daapnae amruk houm." Jeisi Ahin Diir Ferare \v 28 Rouk fare rouk boup asip oum,Marta ahin sepe foyaape Maria ahin, enaim, rouk yaaf fare ouna rouk," pas tre re nim amrouk houae ak foyaape." \v 29 Rouk boup asip oum jirari mari ahin oumigi sepe Jeisi arouk.
+=======
+\v 27 Marta rouk fiposharpe " Pre Tuhan daak arouk jirap mini se ar Tuhan raap Ar,aham yapu tapur houp daapnae amruk houm."
+Jeisi Ahin Diir Ferare \v 28 Rouk fare rouk boup asip oum,Marta ahin sepe foyaape Maria ahin,enaim,rouk yaaf fare ouna rouk," pas tre re nim amrouk houae ak foyaape." \v 29 Rouk boup asip oum jirari mari ahin oumigi sepe Jeisi arouk.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/33.txt

@@ -1 +1,5 @@
-\v 33 Pre oum Jeisi ahm Maria sapeum oum dir yaafrare, Yahudi yanap enpis waspagi sem sain deir, epeam ouh ferare rouk kaap Jeisi am oumtegim roupokum oum. \v 34 Jeisi ahm rouk boup taadharpe, tamroun Lazarus ahim an heeteipe? \v 35 Jeisi ahin dir ferare.
+<<<<<<< HEAD
+\v 33 Pre oum Jeisi ahm Maria sapeum oum dir yaafrare, Yahudi yanap enpis waspagi sem sain deir, epeam ouh ferare rouk kaap Jeisi am oumtegim roupokum oum. \v 34 Jeisi ahm rouk boup taadharpe, tamroun Lazarus ahim an heeteipe? \v 35 Jeisi ahin dir ferare.
+=======
+\v 33 Pre oum Jeisi ahm Maria sapeum oum dir yaafrare, Yahudi yanap enpis waspagi sem sain deir,epeam ouh ferare rouk kaap Jeisi am oumtegim roupokum oum. \v 34 Jeisi ahm rouk boup taadharpe,tamroun Lazarus ahim an heeteipe? \v 35 Jeisi ahin dir ferare.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/38.txt

@@ -1 +1,5 @@
-\v 38 Jeisi,ahinhe aim oumrouk semaim. Tanai te ahim oum huakakup,pre kua kakup enmoup waapgina kapi teahim. \v 39 Jeisi ahm rouk boup asip yaaf fare watna hemaim huakakup oum." Marta ahim enaim Lazarus am rouk boup asip yaaffare,Tuhan amtegin oum tourup pe ahu pre oum weimegi haatnein taam amtegimbeip bapmeteimeki. \v 40 Jeisi rouk boup asip taadins harpe " eine tein dak anrouk boup asip tadns piren frare amtegi Ar, am?
+<<<<<<< HEAD
+\v 38 Jeisi,ahinhe aim oumrouk semaim. Tanai te ahim oum huakakup,pre kua kakup enmoup waapgina kapi teahim. \v 39 Jeisi ahm rouk boup asip yaaf fare watna hemaim huakakup oum." Marta ahim enaim Lazarus am rouk boup asip yaaffare,Tuhan amtegin oum tourup pe ahu pre oum weimegi haatnein taam amtegimbeip bapmeteimeki. \v 40 Jeisi rouk boup asip taadins harpe " eine tein dak anrouk boup asip tadns piren frare amtegi Ar, am?
+=======
+\v 38 Jeisi,ahinhe aim oumrouk semaim. Tanai te ahim oum huakakup,pre kua kakup enmoup waapgina kapi teahim. \v 39 Jeisi ahm rouk boup asip yaaf fare watna hemaim huakakup oum." Marta ahim enaim Lazarus am rouk boup asip yaaffare,Tuhan amtegin oum tourup pe ahu pre oum weimegi haatnein taam amtegimbeip bapmeteimeki. \v 40 Jeisi rouk boup asip taadins harpe " eine tein dak anrouk boup asip tadns piren frare amtegi Ar,am?
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/41.txt

@@ -1 +1,5 @@
-\v 41 Umigi oum huakakup oumigi hauahim wadna pre Jeisi ahm sapae oumigi rouk boup tad harpe ahiah, daak ohou arauk pre sk rouk boup asip danem am jiraman. \v 42 Daak jirari ak jirari boup asip danem, amrouk pre oum yanap-yanap amrouk waspagi raman oum, dak am rouk tare farap pre en yirap sepe roule houpos mimi kakup ram rare fagir ekamare ar dak foumim.
+<<<<<<< HEAD
+\v 41 Umigi oum huakakup oumigi hauahim wadna pre Jeisi ahm sapae oumigi rouk boup tad harpe ahiah, daak ohou arauk pre sk rouk boup asip danem am jiraman. \v 42 Daak jirari ak jirari boup asip danem, amrouk pre oum yanap-yanap amrouk waspagi raman oum, dak am rouk tare farap pre en yirap sepe roule houpos mimi kakup ram rare fagir ekamare ar dak foumim.
+=======
+\v 41 Umigi oum huakakup oumigi hauahim wadna pre Jeisi ahm sapae oumigi rouk boup tad harpe ahiah,daak ohou arauk pre sk rouk boup asip danem am jiraman. \v 42 Daak jirari ak jirari boup asip danem,amrouk pre oum yanap-yanap amrouk waspagi raman oum,dak am rouk tare farap pre en yirap sepe roule houpos mimi kakup ram rare fagir ekamare ar dak foumim.
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2

11/43.txt

@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 \v 43 Rouk boup asip oum fare fohoum oum, Jeisi ahin rouk boup asip yaaffare wouk pemigi "Lazarus, reim teim ar! \v 44 Lazarus ahm hadnum oum jeip wanigina oumigi hampi arukum oumigi pem apir oum roumi kemenukum pre samipaam kiip kup yasep piip kafan gi. Yeisi ahim rouk boup asip enrouk "Tekaseepm's peip-peir oum wanigi warouk kapgi soum ar amigi wanigi."
 \p
- Hap Te Firikum Yeisi Ahin Wasefagi
+ Hap Te Firikum Yeisi Ahin Wasefagi
+=======
+\v 43 Rouk boup asip oum fare fohoum oum,Jeisi ahin rouk boup asip yaaffare wouk pemigi "Lazarus,reim teim ar! \v 44 Lazarus ahm hadnum oum jeip wanigina oumigi hampi arukum oumigi pem apir oum roumi kemenukum pre samipaam kiip kup yasep piip kafan gi. Yeisi ahim rouk boup asip enrouk "Tekaseepm's peip-peir oum wanigi warouk kapgi soum ar amigi wanigi."
+Hap Te Firikum Yeisi Ahin Wasefagi
+>>>>>>> 2314999bb3fa0828620829ce859efae03d9a86b2