Wed May 01 2024 21:58:01 GMT+0100 (Western European Summer Time)

02/01.txt

@@ -1 +1,5 @@
-\c 2 \v 1 Saka ndakati mumwoyo mangu handingaitizve rumwe rwendo kwamuri runokutambudzai. \v 2 Nokuti kana ndichikuchemedzai, ndianiko achasara kuti andifadze kunze kwenyu imi vandinochemedza?
+<<<<<<< HEAD
+\c 2 \v 1 Saka ndati mumoyo mangu hantigaitizve rimwe rwendo kwamuri rinokutabudziasi. \v 2 Kana ndichikuchemedzai, ndiani angandifadze kunze kweuya akatsamwiswa?
+=======
+\c 2 \v 1 Saka ndakati mumwoyo mangu handingaitizve rumwe rwendo kwamuri runokutambudzai. \v 2 Nokuti kana ndichikuchemedzai, ndianiko achasara kuti andifadze kunze kwenyu imi vandinochemedza?
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/03.txt

@@ -1 +1,5 @@
-\v 3 Ndakanyora nenzira iyi kuitira kuti kana ndasvika ndirege kutsamwiswa navaya vaifanira kundifadza. Ndakanga ndine tariro mamuri mose, kuti muchagoverana neni mumufaro wangu. \v 4 Nokuti ndakakunyorerai ndino kusuwa kukuru, nokurwadziwa mumwoyo uye nemisodzi mizhinji, kwete kuti ndikuchemedzei asi kuti ndikuzivisei udzamu hworudo rwangu kwamuri.
+<<<<<<< HEAD
+\v 3 Ndakanyora nenzira iyi kuitira kuti kana ndasvika ndirege kutsamwiswa ne waya waifanira kundifadza. Ini ndinowimba kuti mufaro wangu wakafanana nemufaro wenyu meese. \v 4 Nekuti ndakakunyorerai nekutabudzika kukuru, nekutsamwa kwemoyo, nekuchema kukuru. Ini ndanga ndisingadi kukuchemedzai; kunze kweizvi, ndaida muziwe rudo randiraro nemi.
+=======
+\v 3 Ndakanyora nenzira iyi kuitira kuti kana ndasvika ndirege kutsamwiswa navaya vaifanira kundifadza. Ndakanga ndine tariro mamuri mose, kuti muchagoverana neni mumufaro wangu. \v 4 Nokuti ndakakunyorerai ndino kusuwa kukuru, nokurwadziwa mumwoyo uye nemisodzi mizhinji, kwete kuti ndikuchemedzei asi kuti ndikuzivisei udzamu hworudo rwangu kwamuri.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/05.txt

@@ -1 +1,5 @@
-\v 5 Kana mumwe akauyisa kuchema, haana kuchemedza ini sokuchemedza kwaakaita imi mose, ndisingatauri mashoko akawanda. \v 6 Kurangwa kwaakaitwa navanhu vazhinji kwakamuringana. \v 7 Asi zvino, munofanira kumuregerera nokumunyaradza, kuitira kuti arege kuodzwa mwoyo kwazvo neshungu dzakanyanya.
+<<<<<<< HEAD
+\v 5 Kana pane munhu akakurwadzisai, haana kurwadzisa ini chete, ndisinga taure masoko akawada. \v 6 Kurangwa kwakaitwa newanhu wajinji kwakamurigana. \v 7 Zwino, kunze kurangwa, unofanira kumuregerera nekumunyaradza, kuti iyi asatakure kutsamwa.
+=======
+\v 5 Kana mumwe akauyisa kuchema, haana kuchemedza ini sokuchemedza kwaakaita imi mose, ndisingatauri mashoko akawanda. \v 6 Kurangwa kwaakaitwa navanhu vazhinji kwakamuringana. \v 7 Asi zvino, munofanira kumuregerera nokumunyaradza, kuitira kuti arege kuodzwa mwoyo kwazvo neshungu dzakanyanya.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/08.txt

@@ -1 +1,5 @@
-\v 8 Ndinokukurudzirai, naizvozvo, kuti mumutsiridze rudo rwenyu kwaari. \v 9 Chikonzero chakaita kuti ndikunyorerei chaiva chokuti ndione kana makanga muchigona kumira nokuteerera muzvinhu zvose.
+<<<<<<< HEAD
+\v 8 Nokudaro Ndinokukuridzirai kuti mumutsiridze rudo rwenyu kwaari. \v 9 Chikondzero chakaita kuti ndikunyorerei, chaiwa chekuti ndione kana makanga muchigona mumira nekuterera zvinhu zvose.
+=======
+\v 8 Ndinokukurudzirai, naizvozvo, kuti mumutsiridze rudo rwenyu kwaari. \v 9 Chikonzero chakaita kuti ndikunyorerei chaiva chokuti ndione kana makanga muchigona kumira nokuteerera muzvinhu zvose.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/10.txt

@@ -1 +1,5 @@
-\v 10 Kana muchiregerera munhu upi zvake neniwo ndinomuregerera. Uye zvandakaregerera, kana pane chinhu chandingaregerera, ndakaregerera pamberi paKristu nokuda kwenyu, \v 11 kuitira kuti Satani arege kutinyengera. Nokuti mano ake tinoaziva,
+<<<<<<< HEAD
+\v 10 Kana ukaregerera munhu, uregererezve munhu wacho. Chi chandaregerera, kana uchiregerera zvinhu, wakaregererwa nekuda kwaKristu, \v 11 kuti Satani asakunyegedzei. Nekuti mano ake tinowaziya.
+=======
+\v 10 Kana muchiregerera munhu upi zvake neniwo ndinomuregerera. Uye zvandakaregerera, kana pane chinhu chandingaregerera, ndakaregerera pamberi paKristu nokuda kwenyu, \v 11 kuitira kuti Satani arege kutinyengera. Nokuti mano ake tinoaziva,
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/12.txt

@@ -1 +1,5 @@
-\v 12 Zvino pandakaenda kuTroasi kundoparidza vhangeri raKristu uye ndikaona kuti Ishe akanga andizarurira musuo. \v 13 ndakanga ndisina rugare mumwoyo mangu, nekuti andina kuwanako Tito hama yangu. Saka ndakaonekana nawo ndikaenda kuMasedhonia.
+<<<<<<< HEAD
+\v 12 Umwe musowo wakavurwa naIshe pandakaenda kuTroasi kuti ndiparidze vhangere raKristu. \v 13 kunyangwe kudaro, hadina kuwa nerugare mumweya, Nekuti adina kuwona hama yangu tito. Nokudaro ini ndakamusiya ndikadzokera kuMasedhonia.
+=======
+\v 12 Zvino pandakaenda kuTroasi kundoparidza vhangeri raKristu uye ndikaona kuti Ishe akanga andizarurira musuo. \v 13 ndakanga ndisina rugare mumwoyo mangu, nekuti andina kuwanako Tito hama yangu. Saka ndakaonekana nawo ndikaenda kuMasedhonia.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/14.txt

@@ -1 +1,5 @@
-\v 14 Asi Mwari ngaavongwe, anotikundisa nguva dzose pakufamba kwedu muna Kristu uye kubudikidza nesu anoratidza kwose kwose kunhuhwirira kworuzivo rwake. \v 15 Nokuti isu tiri kunhuhwirira kwaKristu kuna Mwari pakati peavo vari kuponeswa nevari kuparara.
+<<<<<<< HEAD
+\v 14 Asi, nyasha ngadzipuwe Mwari, anotikundisa nguwa dzose pakufamba kwedu muna Jesu Kristu. kubundikidza nesu anotiratidza kwose kwose kunowira kuruziwo rake. \v 15 Nekuti Isu tiri waMwari nezvinunuwirira zvaKristu, newaya wakaponeswa kune waya warikuntzwisisa.
+=======
+\v 14 Asi Mwari ngaavongwe, anotikundisa nguva dzose pakufamba kwedu muna Kristu uye kubudikidza nesu anoratidza kwose kwose kunhuhwirira kworuzivo rwake. \v 15 Nokuti isu tiri kunhuhwirira kwaKristu kuna Mwari pakati peavo vari kuponeswa nevari kuparara.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

02/16.txt

@@ -1 +1,5 @@
-\v 16 Kuno mumwe tiri munhuwi worufu; kuno mumwewo tiri kunhuhwirira kwoupenyu. Zvino ndianiko angakwanisa basa rakadai? \v 17 Nokuti hatina kufanana navazhinji vanokanganisa shoko raMwari vachida kuwana mugove kubva pariri. Asi, tinotaura muna Kristu nokutendeka pamberi paMwari, ||savanhu vakatumwa naMwari.
+<<<<<<< HEAD
+\v 16 Kune warikutwzisisa, munuwirwa werufu iyi rufu. Kune waya warikuponeswa, uye munuwirwa weupenyu upenyu. Ndianiko akakudzera kuita zvinhu izvi?  \v 17 Nekuti isu atisi sawaya wanotegensa shoko raMwari kuti waite mare. Kunzi kweizvi, nezvikodzero zvakachena, tinotaura naKristu, semutumwa waMwari, dziso raMwari.
+=======
+\v 16 Kuno mumwe tiri munhuwi worufu; kuno mumwewo tiri kunhuhwirira kwoupenyu. Zvino ndianiko angakwanisa basa rakadai? \v 17 Nokuti hatina kufanana navazhinji vanokanganisa shoko raMwari vachida kuwana mugove kubva pariri. Asi, tinotaura muna Kristu nokutendeka pamberi paMwari, ||savanhu vakatumwa naMwari.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/01.txt

@@ -1 +1,5 @@
-\c 4 \v 1 Naizvozvo, sezvo tine ushumiri uhu kubudikidza netsitsi dzaMwari, hatiori mwoyo. \v 2 Asi takaramba zvinhu zvakavanzika uye nenzira dzinonyadzisa; hatishandisi unyengeri, uye hatiminamisi shoko raMwari. Asi pakuratidza kwedu zvokwadi, tinozvireverera muhana yomunhu wose pamberi paMwari.
+<<<<<<< HEAD
+\c 4 \v 1 Naizvozvo, nekushumira uku, uye nekuda kwengoni dzenyu, musahore moyo. \v 2 Taramba zvinhu zvakawadzika uye nenzira dzinonyadzisa. Atirarame neunyegere, hatiminamise Shoko raMwari. Asi mukaratidza chokwandi, tinozvirewerera muhana wemunhu wese pamberi paMwari.
+=======
+\c 4 \v 1 Naizvozvo, sezvo tine ushumiri uhu kubudikidza netsitsi dzaMwari, hatiori mwoyo. \v 2 Asi takaramba zvinhu zvakavanzika uye nenzira dzinonyadzisa; hatishandisi unyengeri, uye hatiminamisi shoko raMwari. Asi pakuratidza kwedu zvokwadi, tinozvireverera muhana yomunhu wose pamberi paMwari.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/03.txt

@@ -1 +1,5 @@
-\v 3 Uye kunyange zvazvo vhangeri redu rakafukidzwa, rakafukidzwa kuna avo vari kuparara. \v 4 Vasingatendi vakapofumadzwa ndangariro dzavo namwari wenyika ino, kuti varege kuona chiedza chevhangeri rokubwinya kwaKristu, anova mufananidzo waMwari.
+<<<<<<< HEAD
+\v 3 Asi, kana vhangere yedu rakawadzika, zvakawadzika zvirikunewaya warikuparara. \v 4 Mwari wenyika ino akawapofamadza pfugwa kune waya wasingatende, uye, haukwanisi kuwona chiedza chevhangere mukubwinya kwaKristu, uye mufananidzo waMwari.
+=======
+\v 3 Uye kunyange zvazvo vhangeri redu rakafukidzwa, rakafukidzwa kuna avo vari kuparara. \v 4 Vasingatendi vakapofumadzwa ndangariro dzavo namwari wenyika ino, kuti varege kuona chiedza chevhangeri rokubwinya kwaKristu, anova mufananidzo waMwari.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/05.txt

@@ -1 +1,5 @@
-\v 5 Nokuti hatizviparidzi isu, asi Jesu Kristu saShe, uye isu savaranda venyu nokuda kwaJesu. \v 6 Nokuti Mwari akati, “Chiedza ngachipenye murima,” akaita kuti chiedza chake chipenye mumwoyo yedu kuti tiwane chiedza choruzivo rwokubwinya kwaMwari muchiso chaKristu.
+<<<<<<< HEAD
+\v 5 Nekuti Atiparedze isu, asi Jesu Kristu saIshe wedu, seso sewaranda wenyu, nekuda kwaJesu. \v 6 Ngei ndiMwari kati: ''Chiedza chichapenya murima''. Iye akapenya mumoyo yedu kuti tivenekwe neruziwo rekubwinya kwaMwariNemeso yaJesu kristu.
+=======
+\v 5 Nokuti hatizviparidzi isu, asi Jesu Kristu saShe, uye isu savaranda venyu nokuda kwaJesu. \v 6 Nokuti Mwari akati, “Chiedza ngachipenye murima,” akaita kuti chiedza chake chipenye mumwoyo yedu kuti tiwane chiedza choruzivo rwokubwinya kwaMwari muchiso chaKristu.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/07.txt

@@ -1 +1,5 @@
-\v 7 Asi pfuma iyi tinayo mumidziyo yevhu kuratidza kuti simba iri rinopfuura zvose rinobva kuna Mwari kwete kwatiri. \v 8 Tinomanikidzwa kumativi ose, asi hatipwanyiwi; tinokanganiswa, asi hatina kuora mwoyo; \v 9 9 tinotambudzwa, asi hatina kusiyiwa; takawisirwa pasi, asi hatina kuparadzwa. \v 10 Tinoramba tichitakura nguva dzose mumuviri wedu kufa kwaJesu, kuti upenyu hwaJesu huratidzwewo mumuviri wedu.
+<<<<<<< HEAD
+\v 7 Nokudaro, Pfuma iyi tinayo mumidziyo yevhu, kuratidza kuti simba iri rinopfura zvose rinobva kuna Mwari kwete kwatiri. \v 8 Tinomanikidzwa kumatiwe ose, asi atikudwi; tinokakaniswa, atina kuora moyo; \v 9 Kutewerwa,  asi kwete kusiwa; takawisirwa pasi, asi atina kuparadzwa. \v 10 Tinotakura mazuwa ose mumwiri yedu rufu rwaJesu, kuti kuya kwake kuratidzwe pamwiri yedu.
+=======
+\v 7 Asi pfuma iyi tinayo mumidziyo yevhu kuratidza kuti simba iri rinopfuura zvose rinobva kuna Mwari kwete kwatiri. \v 8 Tinomanikidzwa kumativi ose, asi hatipwanyiwi; tinokanganiswa, asi hatina kuora mwoyo; \v 9 9 tinotambudzwa, asi hatina kusiyiwa; takawisirwa pasi, asi hatina kuparadzwa. \v 10 Tinoramba tichitakura nguva dzose mumuviri wedu kufa kwaJesu, kuti upenyu hwaJesu huratidzwewo mumuviri wedu.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/11.txt

@@ -1 +1,5 @@
-\v 11 Nokuti isu vapenyu tinoramba tichiiswa kurufu nokuda kwaJesu, kuti upenyu hwake huratidzwe mumuviri wedu unofa. \v 12 Saka naizvozvo kufa kunobata matiri, asi upenyu hunobata mamuri.
+<<<<<<< HEAD
+\v 11 Isu, tinorarama, tinopuwa kurufu nekuda kwaJesu, kuti upenyu waJesu uwoneke mumwiri dzedu zuwa ne zuwa. \v 12 Kuti rufu richande matiri, asi upenyu mamuri.
+=======
+\v 11 Nokuti isu vapenyu tinoramba tichiiswa kurufu nokuda kwaJesu, kuti upenyu hwake huratidzwe mumuviri wedu unofa. \v 12 Saka naizvozvo kufa kunobata matiri, asi upenyu hunobata mamuri.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/13.txt

@@ -1 +1,5 @@
-\v 13 Kwakanyorwa kuchinzi: “Ndakatenda; naizvozvo ndikataura.” Nomweya mumwe chete iwoyo wokutenda takatendawo uye naizvozvo tinotaura. \v 14 Nokuti tinoziva kuti iye akamutsa Ishe wedu Jesu kubva kuvakafa achazotimutsawo pamwe chete naJesu uye agotisvitsa pamberi pake pamwe chete nemi. \v 15 15 Izvi zvose zvinoitwa nokuda kwenyu, kuitira kuti nyasha dziri kusvikira vanhu vazhinji dziwanze kuvonga kuti Mwari akudzwe.
+<<<<<<< HEAD
+\v 13 Asi isu tese tine Mweya umwe mukutenda, sezvanyorwa: ''Ini ndakatenda uye, hosaka ndakataura.'' Isuwo ndakatenda uye, usaka takataura. \v 14 Tinoziwa kuti Uya akamutsa Ishe Jesu achatimutsawo na Jesu, Iye achaudza nemiwo pamberi penyu. \v 15 Zvinhu zvese inyanya yake,  nekuda kwenyasha dzakawada dzake, Mabasa yenyasha anoudza kukudza kwaMwari.
+=======
+\v 13 Kwakanyorwa kuchinzi: “Ndakatenda; naizvozvo ndikataura.” Nomweya mumwe chete iwoyo wokutenda takatendawo uye naizvozvo tinotaura. \v 14 Nokuti tinoziva kuti iye akamutsa Ishe wedu Jesu kubva kuvakafa achazotimutsawo pamwe chete naJesu uye agotisvitsa pamberi pake pamwe chete nemi. \v 15 15 Izvi zvose zvinoitwa nokuda kwenyu, kuitira kuti nyasha dziri kusvikira vanhu vazhinji dziwanze kuvonga kuti Mwari akudzwe.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

04/16.txt

@@ -1 +1,5 @@
-\v 16 Naizvozvo hatiori mwoyo. Kunyange zvazvo kunze tichiparara, asi mukati tiri kuvandudzwa zuva nezuva. \v 17 Nokuti chiedza chedu nokutambudzika kwedu kwechinguva chiduku zviri kutiitira kubwinya kusingaperi, kukuru kupfuura zvose. \v 18 Naizvozvo hatitarisi zvinoonekwa, asi zvisingaonekwi. Nokuti zvinoonekwa zvinopfuura, asi zvisingaonekwi zvinogara nokusingaperi.
+<<<<<<< HEAD
+\v 16 Naizvozvo, hatiore moyo. kunyangwe zvazvo kunze tichaparara, asi mukati tirikuwadudzwa zuwa nezuwa. \v 17 Nekuti chiedza chinhu nekutabudzika kwedu kuchiguwa chiduku zvirikuitira kubwinya kusingapere. \v 18 Naizvozvo atitarese zvinowonekwa, asi kuzvinhu zvisingawonekwe. Zvinhu zvatinokwanisa kuwona zvinopera, asi zvino zvisigawonekwe azvipere.
+=======
+\v 16 Naizvozvo hatiori mwoyo. Kunyange zvazvo kunze tichiparara, asi mukati tiri kuvandudzwa zuva nezuva. \v 17 Nokuti chiedza chedu nokutambudzika kwedu kwechinguva chiduku zviri kutiitira kubwinya kusingaperi, kukuru kupfuura zvose. \v 18 Naizvozvo hatitarisi zvinoonekwa, asi zvisingaonekwi. Nokuti zvinoonekwa zvinopfuura, asi zvisingaonekwi zvinogara nokusingaperi.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/01.txt

@@ -1 +1,5 @@
-\c 6 \v 1 Savashandi pamwe chete naMwari tinokukurudzirai kuti murege kugamuchira nyasha dzaMwari pasina. \v 2 Nokuti iye anoti, “Ndakakunzwa panguva yenyasha dzangu, uye pazuva roruponeso ndakakubatsira.” Ndinokuudzai, zvino ndiyo nguva yenyasha dzaMwari, zvino ndiyo nguva yoruponeso, \v 3 Hatiisi chigumbuso munzira yomunhu, kuti ushumiri hwedu hurege kuzvidzwa.
+<<<<<<< HEAD
+\c 6 \v 1 Tinoshanda pamwechete na Mwari, isu tinokumbira kuti tisagamuchire nyasha dzaMwari pahara. \v 2 Nekuti Iye anoti: ''panguwa dzenyasha ndakakuzwa, uye pazuwa reruponesu takakubatsira!''. Tarirai ino inguwa iruponeso; zvino mazuwa eruponeso. \v 3 Isu atiise mbuwe pane munhu kuti adonhe, Kuti shumiro irege kushairwa nyaya.
+=======
+\c 6 \v 1 Savashandi pamwe chete naMwari tinokukurudzirai kuti murege kugamuchira nyasha dzaMwari pasina. \v 2 Nokuti iye anoti, “Ndakakunzwa panguva yenyasha dzangu, uye pazuva roruponeso ndakakubatsira.” Ndinokuudzai, zvino ndiyo nguva yenyasha dzaMwari, zvino ndiyo nguva yoruponeso, \v 3 Hatiisi chigumbuso munzira yomunhu, kuti ushumiri hwedu hurege kuzvidzwa.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/04.txt

@@ -1 +1,5 @@
-\v 4 Asi savaranda vaMwari tinozvirumbidza pane zvakanaka munzira dzose: mukutsungirira kukuru, mumatambudziko, mukuomerwa, uye nemunhamo; \v 5 mukurohwa, kusungwa nomubope; mukushanda zvakaoma, mukusavata nokushayiwa zvokudya; \v 6 mukuchena, kunzwisisa, mwoyo murefu nengoni muMweya Mutsvene uye nomurudo rwechokwadi; \v 7 mushoko rechokwadi nomusimba raMwari; nenhumbi dzokurwa nadzo dzokururama kuruoko rworudyi nokuruboshwe,
+<<<<<<< HEAD
+\v 4 Kunze kwaizvozvo, tinoratidza nezvikuti washumiri waMwari: nekutsugirira, zvijinji, nekushaiwa, nekutambura, nekutsamwa, \v 5 kuchaiwa, mukusugwa nemubope; mukushanda zvakaoma, usiku tisina hope, ne dzara; \v 6 mukuchena, kunzwisisa, moyo murefu,nengoni mumweya mutswene uye nerudo rwechokwandi, \v 7 neshoko rechokwandi uye nesimba raMwari;  nepfuti rekururama nemowoko werudye kana muboskwe,
+=======
+\v 4 Asi savaranda vaMwari tinozvirumbidza pane zvakanaka munzira dzose: mukutsungirira kukuru, mumatambudziko, mukuomerwa, uye nemunhamo; \v 5 mukurohwa, kusungwa nomubope; mukushanda zvakaoma, mukusavata nokushayiwa zvokudya; \v 6 mukuchena, kunzwisisa, mwoyo murefu nengoni muMweya Mutsvene uye nomurudo rwechokwadi; \v 7 mushoko rechokwadi nomusimba raMwari; nenhumbi dzokurwa nadzo dzokururama kuruoko rworudyi nokuruboshwe,
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/08.txt

@@ -1 +1,5 @@
-\v 8 mukukudzwa nomukusakudzwa, muguhu rakaipa neguhu rakanaka; tiri vechokwadi, asi tichionekwa savanyengeri; \v 9 tinozivikanwa tichionekwa setisingazivikanwi; tinofa, asi tichiramba tichirarama, tinorohwa asi hatifi; \v 10 savanochema, asi tichigara tichifara; savarombo, asi tichipfumisa vazhinji; setisina chinhu, asi tinazvo zvose.
+<<<<<<< HEAD
+\v 8 Kunyangwe mukukudzwa kana mukudzikisirwa, muguhu rakaipa nemuguhu rakanaka; kuwa sewanyegere, asi tire wechokwandi; \v 9 kunge tisigasikanwe, asi tichizikanwa; kunge takafa, asi tiriwapenyu! Tinoragwa nebasa yedu, asi kwete ne kutogwa ne rufu; \v 10 kunge wakatsamwa, asi zuwa ne zuwa tichifara; kunge warombo, asi tichipfuma kajinji; kunge awona chinhu, asi une zwese.
+=======
+\v 8 mukukudzwa nomukusakudzwa, muguhu rakaipa neguhu rakanaka; tiri vechokwadi, asi tichionekwa savanyengeri; \v 9 tinozivikanwa tichionekwa setisingazivikanwi; tinofa, asi tichiramba tichirarama, tinorohwa asi hatifi; \v 10 savanochema, asi tichigara tichifara; savarombo, asi tichipfumisa vazhinji; setisina chinhu, asi tinazvo zvose.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/11.txt

@@ -1 +1,5 @@
-\v 11 Takataura kwamuri pachena, imi vaKorinde, uye takazarura mwoyo yedu kwamuri. \v 12 Hatisi kukunyimai rudo rwedu, asi imi munotinyima rwenyu. \v 13 Sokutsinhana kwakanaka, ndinotaura sokuvana vangu, zaruraiwo mwoyo yenyu.
+<<<<<<< HEAD
+\v 11 Tinokutaurira mese chokwadi, kuwaKorendi, uye moyo dzedu dzaka vurika. \v 12 Moyo dzenyu adzina kuvarwa nesu, asi dzakavarwa nekufunga kwenyu. \v 13 Zvino, kune mubadaro wakarurama, ndinotaurira wana: vhurai moyo dzenyu.
+=======
+\v 11 Takataura kwamuri pachena, imi vaKorinde, uye takazarura mwoyo yedu kwamuri. \v 12 Hatisi kukunyimai rudo rwedu, asi imi munotinyima rwenyu. \v 13 Sokutsinhana kwakanaka, ndinotaura sokuvana vangu, zaruraiwo mwoyo yenyu.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/14.txt

@@ -1 +1,5 @@
-\v 14 Musasungwa zvisina kufanira pajoko rimwe chete navasingatendi. Nokuti kururama kungava noukama hweiko nokusarurama? Kana kuti chiedza chingawadzana seiko nerima? \v 15 Ko, Kristu anganzwanana seiko naBheriari? Ko, mutendi angava nomugove weiko neasingatendi? \v 16 Ko,temberi yaMwari ingatenderana seiko nezvifananidzo? Nokuti tiri temberi yaMwari mupenyu. Sezvakarehwa naMwari, achiti, “Ndichagara pakati pavo ndigofamba navo, uye ndichava Mwari wavo, ivo vagova vanhu vangu.
+<<<<<<< HEAD
+\v 14 Musasugwa nejoko musina kufanira rimwe chete nawasingatende? Rima reneukama upiko newakarurama? \v 15 Ko Kristu angakwanisa seiko naBheriani? mutende aneukama sei newasingatende? \v 16 Ukama upiko una mwari newanonamata mifananidzo? Nekuti isu tirikereke yaMwari repenyu, Mwari akati: '' Ini ndicharara mawari uye ndichafamba mawari. Kana ndiri Mwari wako, uye iwo wachawa wanhu wangu.
+=======
+\v 14 Musasungwa zvisina kufanira pajoko rimwe chete navasingatendi. Nokuti kururama kungava noukama hweiko nokusarurama? Kana kuti chiedza chingawadzana seiko nerima? \v 15 Ko, Kristu anganzwanana seiko naBheriari? Ko, mutendi angava nomugove weiko neasingatendi? \v 16 Ko,temberi yaMwari ingatenderana seiko nezvifananidzo? Nokuti tiri temberi yaMwari mupenyu. Sezvakarehwa naMwari, achiti, “Ndichagara pakati pavo ndigofamba navo, uye ndichava Mwari wavo, ivo vagova vanhu vangu.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

06/17.txt

@@ -1 +1,5 @@
-\v 17 Saka budai mubve pakati pavo uye muzvitsaure, ndizvo zvinotaura Ishe. ‘Musabata chinhu chine tsvina, ini ndigokugamuchirai. \v 18 Ndichava baba venyu, uye imi muchava vanakomana vangu navanasikana vangu,’ ndizvo zvinotaura Ishe Wamasimba Ose.
+<<<<<<< HEAD
+\v 17 Naizvozvo, ibva pakati pawo, uye muzvitsaure, ndizvo zvinotaura Ishe. \v 18 Uye musabata kune zvinhu zvakasvibha, uye Ini ndichakutorai. Ini ndichawa saBaba, imi muchawa wana wangu'',Ndizvo zvinotaura Ishe weMasimba-Ose.
+=======
+\v 17 Saka budai mubve pakati pavo uye muzvitsaure, ndizvo zvinotaura Ishe. ‘Musabata chinhu chine tsvina, ini ndigokugamuchirai. \v 18 Ndichava baba venyu, uye imi muchava vanakomana vangu navanasikana vangu,’ ndizvo zvinotaura Ishe Wamasimba Ose.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/01.txt

@@ -1 +1,5 @@
-\c 7 \v 1 Shamwari dzinodikanwa, sezvo tine zvipikirwa izvi, ngatizvinatsei kubva pazvinhu zvinosvibisa muviri nomweya, tichikwanisa utsvene pakutya Mwari.
+<<<<<<< HEAD
+\c 7 \v 1 Hama, sezvo tinechipikirwa ichi, ndinozvichenesa pane zvese zvakasvipa mumwiri yedu ne mweya. katitsake kururama mutya Mwari.
+=======
+\c 7 \v 1 Shamwari dzinodikanwa, sezvo tine zvipikirwa izvi, ngatizvinatsei kubva pazvinhu zvinosvibisa muviri nomweya, tichikwanisa utsvene pakutya Mwari.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/02.txt

@@ -1 +1,5 @@
-\v 2 Tigadzirireiwo nzvimbo mumwoyo yenyu. Hatina munhu watakatadzira, hatina munhu watakanyengera, hatina munhu watakaitira zvisakarurama. \v 3 Handitauri izvi kuti ndikupei mhosva; ndakambotaura kare kuti imi muri mumwoyo yedu zvokuti tingagona kurarama kana kufa pamwe chete nemi. \v 4 Ndinovimba nemi zvikuru; ndinozvirumbidza zvikuru nokuda kwenyu. Ndinokurudzirwa zvikuru; mumatambudziko edu ose mufaro wangu hauna magumo.
+<<<<<<< HEAD
+\v 2 Tigadzirirei nzvimbo mumoyo menyu. atina munhu watakatadzira akuna munhu watakaitira zvasakarurama, atina kubvisa zvakanaka penemunhu. \v 3 Anditaure izvi kuti ndikutogei, nekuti ndati murimoyo yedu, tinogona kurarama kana kufa tose. \v 4 Ndinowimba nemi, ndinozvirimbidza zvikuru nekuda kwenyu. Ndinokurudzirwa zvikuru mumatambudzko edu ose mufaro wangu haana magomo.
+=======
+\v 2 Tigadzirireiwo nzvimbo mumwoyo yenyu. Hatina munhu watakatadzira, hatina munhu watakanyengera, hatina munhu watakaitira zvisakarurama. \v 3 Handitauri izvi kuti ndikupei mhosva; ndakambotaura kare kuti imi muri mumwoyo yedu zvokuti tingagona kurarama kana kufa pamwe chete nemi. \v 4 Ndinovimba nemi zvikuru; ndinozvirumbidza zvikuru nokuda kwenyu. Ndinokurudzirwa zvikuru; mumatambudziko edu ose mufaro wangu hauna magumo.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/05.txt

@@ -1 +1,5 @@
-\v 5 Nokuti patakasvika kuMasedhonia, muviri wedu uyu hauna kuwana zororo, asi takatambudzwa kumativi ose, zvaiti kukakavara kunze, nokutya nechomukati. \v 6 Asi Mwari anonyaradza vakaora mwoyo, akatinyaradza pakauya Tito. \v 7 Kwete nokuda kwokuuya kwake bedzi, asiwo nokuda kwokunyaradza kwamakamupa. Akatiudza nezvokundishuva kwenyu, kusuwa kwenyu kukuru, nokuva nehanya kwenyu pamusoro pangu, saka mufaro wangu wakava mukuru kwazvo.
+<<<<<<< HEAD
+\v 5 Patakuya kuMasedhonia, mwiri wedu hauna zororo: kunze kweizvi, takatambudzwa kumativi ose, zvaitikukakawara kunze nekutya nechomukati. \v 6 Asi Mwari anonyorodza wasina tariro, akatinyaradza pakuya kwaTito. \v 7 Mwari haana kutinyaradze nekuya kwake, asi nekunyaradzwa kwamakagamuchira. Akatiudza nezvekundishuwa kwenyu, Kusuwa kwenyu pamusoro pangu saka mufaro wangu wakawa mukuru kwazvo.
+=======
+\v 5 Nokuti patakasvika kuMasedhonia, muviri wedu uyu hauna kuwana zororo, asi takatambudzwa kumativi ose, zvaiti kukakavara kunze, nokutya nechomukati. \v 6 Asi Mwari anonyaradza vakaora mwoyo, akatinyaradza pakauya Tito. \v 7 Kwete nokuda kwokuuya kwake bedzi, asiwo nokuda kwokunyaradza kwamakamupa. Akatiudza nezvokundishuva kwenyu, kusuwa kwenyu kukuru, nokuva nehanya kwenyu pamusoro pangu, saka mufaro wangu wakava mukuru kwazvo.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/08.txt

@@ -1 +1,5 @@
-\v 8 Kunyange zvazvo ndakakuchemedzai netsamba yangu, handizvidembi nokuda kwaizvozvo. Kunyange zvangu ndakazvidemba, ndinoona kuti tsamba yangu yakakurwadzai, asi kwenguva duku chete \v 9 Asi zvino ndinofara, kwete nokuti makachema, asi nokuti kusuwa kwenyu kwakaita kuti mutendeuke. Nokuti makava nokusuwa kukuru sezvaidiwa naMwari uye nokudaro hamuna kukuvadzwa nesu nenzira ipi zvayo. \v 10 Nokuti kusuwa kwoumwari kunouyisa kutendeuka uko kunotungamirira kuruponeso uye hakuuyisi kudemba, asi kusuwa kwenyika kunouyisa rufu.
+<<<<<<< HEAD
+\v 8 Kunyangwe tsamba yangu yakakutsamwisai, hadizvindebe nokuda kwaizvozvo, kunyangwe zvangu ndakazvidemba ndinoona kuti tsamba yangu yakakurwadzai asi kwenguwa iduku chete. \v 9 Zvino ini ndinofara, kwete kuti makatabudzika, asi sei muchitsamwa zvakakutorai kuzvidemba. Nekuti makawa nekusuwa kukuru nezvaidiwa na Mwari, Nokudaro musatambudzike, nenyaya yeizvi. \v 10 Nekuti kusuwa kweumwari kunoudza kudendeuka uko kunotogamirirwa neruponesu; uye akuuisi kudemba; kusuwa munyika kunoudza rufu.
+=======
+\v 8 Kunyange zvazvo ndakakuchemedzai netsamba yangu, handizvidembi nokuda kwaizvozvo. Kunyange zvangu ndakazvidemba, ndinoona kuti tsamba yangu yakakurwadzai, asi kwenguva duku chete \v 9 Asi zvino ndinofara, kwete nokuti makachema, asi nokuti kusuwa kwenyu kwakaita kuti mutendeuke. Nokuti makava nokusuwa kukuru sezvaidiwa naMwari uye nokudaro hamuna kukuvadzwa nesu nenzira ipi zvayo. \v 10 Nokuti kusuwa kwoumwari kunouyisa kutendeuka uko kunotungamirira kuruponeso uye hakuuyisi kudemba, asi kusuwa kwenyika kunouyisa rufu.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/11.txt

@@ -1 +1,5 @@
-\v 11 Tarirai zvaitwa mamuri nekusuwa uku kwoumwari: kushinga kukuru kwakadii, ishungu dzakadii kuti muzvichenese, kutsamwa kwakadii nekutya kwakadii nechishuvo chakadii, nehanya yakadii, nekuda kuona kururamisira kuchiitwa kwakadii. Pazvinhu zvose mazviratidza kuti hamuna mhosva panyaya iyi. \v 12 Saka kunyange zvangu ndakakunyorerai, ndakanga ndisingazviiti nekuda kwaiye akaita zvakaipa, kana nekuda kwaiye akaitirwa zvakaipa, asi kuti pamberi paMwari mugone kuzvionera kuti makazvipira sei kwatiri.
+<<<<<<< HEAD
+\v 11 Tarirai zvaitwa mamuri nokusuwa uku kwaMwari. Kushinga kukuru kwakadi inshugu zvakati muzvichenese. Kutsamwa kwakadi, nekutya kwakandi, nekuchiwa kwakadi,  neyanya yakadi nekuda kuwona kururamisira kuchiitwa kwakadi! pazvino zvose mazviratidza kuti hamuna mosva panyaya iyi. \v 12 Kunyangwe ndakakunyorerai, hadina kunyora newaiti wezvakaipa, kunyangwe wakatabudzika, kuti pamberi paMwari mugone kuzvionera kuti makasvipira sei kwamuri.
+=======
+\v 11 Tarirai zvaitwa mamuri nekusuwa uku kwoumwari: kushinga kukuru kwakadii, ishungu dzakadii kuti muzvichenese, kutsamwa kwakadii nekutya kwakadii nechishuvo chakadii, nehanya yakadii, nekuda kuona kururamisira kuchiitwa kwakadii. Pazvinhu zvose mazviratidza kuti hamuna mhosva panyaya iyi. \v 12 Saka kunyange zvangu ndakakunyorerai, ndakanga ndisingazviiti nekuda kwaiye akaita zvakaipa, kana nekuda kwaiye akaitirwa zvakaipa, asi kuti pamberi paMwari mugone kuzvionera kuti makazvipira sei kwatiri.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/13.txt

@@ -1 +1,5 @@
-\v 13 Naizvozvi zvose tinokurudzirwa, Pamusoro pokukurudzirwa kwedu, takanyanya kufadzwa zvikuru nekuona mufaro wakanga una Tito, nekuti mweya wake wakasimbiswa nemi mose. \v 14 Nekuti ndakanga ndazvirumbidza kwaari pamusoro penyu, uye hamuna kundinyadzisa. Asi sezvo zvose zvatakataura pamusoro penyu zvaiwa chokwadi, saka kuzvirumbidza kwedu kuna Tito pamusoro penyu kwakaratidza kuti ndokwechokwadiwo.
+<<<<<<< HEAD
+\v 13 Nokuda kweizvi, tinokurudzirwa. kunze kwekunyaradzwa kwedu, isu tinofara nekuda kwemufaro waTito, nekuti mweya wangu makuusimbisa newese. \v 14 Nekuti ndinozvikudza pamberi pake nekuti hatina kunyadziswa; sezvo zvese zvatakataura pamusoro penyu kuzvikudza kwedu pamberi paTito nekwechokwandi.
+=======
+\v 13 Naizvozvi zvose tinokurudzirwa, Pamusoro pokukurudzirwa kwedu, takanyanya kufadzwa zvikuru nekuona mufaro wakanga una Tito, nekuti mweya wake wakasimbiswa nemi mose. \v 14 Nekuti ndakanga ndazvirumbidza kwaari pamusoro penyu, uye hamuna kundinyadzisa. Asi sezvo zvose zvatakataura pamusoro penyu zvaiwa chokwadi, saka kuzvirumbidza kwedu kuna Tito pamusoro penyu kwakaratidza kuti ndokwechokwadiwo.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

07/15.txt

@@ -1 +1,5 @@
-\v 15 Uye rudo rwake kwamuri rukuru kwazvo paanorangarira kuti mose makanga muchiteerera, pamakamugamuchira nekutya nekudedera. \v 16 Ndinofara kuti ndinogona kuwimba nemi zvizere.
+<<<<<<< HEAD
+\v 15 Uye rudo rwake pamberi penyu ukuru kwazvo paanoragarira kuti mose makanga muchiterera pamakamugamuchira nokutya nekudedera. \v 16 Ndinofara ndigone kuwimba neni zvisere.
+=======
+\v 15 Uye rudo rwake kwamuri rukuru kwazvo paanorangarira kuti mose makanga muchiteerera, pamakamugamuchira nekutya nekudedera. \v 16 Ndinofara kuti ndinogona kuwimba nemi zvizere.
+>>>>>>> eff0b49e44836f30cb98bec89a887de8d791a345

manifest.json

@@ -3,7 +3,7 @@
 	"format": "usfm",
 	"generator": {
 		"name": "ts-desktop",
-		"build": "195"
+		"build": "543"
 	},
 	"target_language": {
 		"id": "mxc-MZ-chimanika",
@@ -33,12 +33,19 @@
 	],
 	"parent_draft": {},
 	"translators": [
+		"Itai",
+		"Carlitos Joao",
+		"Itai_Viegas",
+		"Carlitos JP Alfazema",
 		"salomao",
 		"o tall cjm",
-		"Itai_Viegas",
 		"salomao cjm"
 	],
 	"finished_chunks": [
+		"02-title",
+		"04-title",
+		"06-title",
+		"07-title",
 		"front-title",
 		"01-title",
 		"01-01",
@@ -52,15 +59,6 @@
 		"01-19",
 		"01-21",
 		"01-23",
-		"02-title",
-		"02-01",
-		"02-03",
-		"02-05",
-		"02-08",
-		"02-10",
-		"02-12",
-		"02-14",
-		"02-16",
 		"03-title",
 		"03-01",
 		"03-04",
@@ -69,14 +67,6 @@
 		"03-12",
 		"03-14",
 		"03-17",
-		"04-title",
-		"04-01",
-		"04-03",
-		"04-05",
-		"04-07",
-		"04-11",
-		"04-13",
-		"04-16",
 		"05-title",
 		"05-01",
 		"05-04",
@@ -87,21 +77,6 @@
 		"05-16",
 		"05-18",
 		"05-20",
-		"06-title",
-		"06-01",
-		"06-04",
-		"06-08",
-		"06-11",
-		"06-14",
-		"06-17",
-		"07-title",
-		"07-01",
-		"07-02",
-		"07-05",
-		"07-08",
-		"07-11",
-		"07-13",
-		"07-15",
 		"08-title",
 		"08-01",
 		"08-03",