diff --git a/22/28.txt b/22/28.txt
index 8f813a20..8c94293e 100644
--- a/22/28.txt
+++ b/22/28.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 28 Akinán klawaniw: para chuná nakinkawanikanán akinán chi para kinkamankán chuna nakawanikán namín kilhtamakú, akinán nak wanaw: "! Kaukxilhtit! umá xatatlawalakgxtu pulakgtakilhputan xla Puchiná, wa tu kinatlanakán tlawakgonit, ni wa para ka namaklakaskinkán, huampi ka lilakapastakni kimpalakatakan chu mi palakatakán. \v 29 ni chuná kalalh para ka naklilakatakiyaw Puchiná, chu lanchiyú ni para ka naklitamakgatliniyaw Puchina ktlawamanaw umá pulakgtakilhputan ni huá para antá nakmastayaw tatakín tu lilakgtakilhputakan Dios, sampi ey wi tamá pulakgatakilhputan xla Puchiná kiDioskan tu wi nac chiki tani lakgatakilhputakan Dios."
-=======
-\v 28 \v 29 28 Akinán klawaniw: para chuná nakinkawanikanán akinán chi para kinkamankán chuna nakawanikán, akinán nak wanaw: "¡Kaukxilhtit! umá xatatlawalakgxtu pulakgtakilhputan xla Puchiná, wa tu kinatlanakán tlawakgonit, ni wa para ka namaklakaskinkán, huampi ka lilakapastakni kimpalakatakán chu mi palakatakán. 29 ni chuná kalalh ni nak naklakgachixcuwimakganaw Puchiná, chu niajlh nakstalaniyaw, nitu ktlawamanaw akgtum  pulakgtakilhputan, hey wi tamá pulakgatakilhputan xla Puchiná kiDioskan tu wi xlakatín chiki tani lakgatakilhputakan Dios."
->>>>>>> 8a3d0b2cad9058dfb3bb3faea6bb28093f6ebd42
+\v 28 Akinán klawaniw: para chuná nakinkawanikanán akinán chi para kinkamankán chuna nakawanikán, akinán nak wanaw: "¡Kaukxilhtit! umá xatatlawalakgxtu pulakgtakilhputan xla Puchiná, wa tu kinatlanakán tlawakgonit, ni wa para ka namaklakaskinkán, huampi ka lilakapastakni kimpalakatakán chu mi palakatakán. \v 29 ni chuná kalalh ni nak naklakgachixcuwimakganaw Puchiná, chu niajlh nakstalaniyaw, nitu ktlawamanaw akgtum  pulakgtakilhputan, hey wi tamá pulakgatakilhputan xla Puchiná kiDioskan tu wi xlakatín chiki tani lakgatakilhputakan Dios."
\ No newline at end of file
diff --git a/22/30.txt b/22/30.txt
index 53404b5c..cc86fb48 100644
--- a/22/30.txt
+++ b/22/30.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 30 Acxní Finees xpalakachiwiná Dios chu laktalipaw chixcuwín akgatunú xkachikincán hua ti akxtum xtaminkgonit, kgaxmatkgolh umá tachiwin tu tachiwina xkamanan Rubén, Gad chu Manasés, akgatakgskgolh chu tlan tlawakgolh ama tachiwín. \v 31 Finees, xkgawasa Eleazar xpalakachiwiná Dios, kawanilh amá xkamanán Rubén, Gad chu Manasés: "Lanchiyu katsinitaw pi wa Puchiná kinkatawilán, sampi wixinan nitu lakatakipatit Puchiná. , Uma puntsú, wixinán lakgmaxtutit xkachikin Israel nakxmakán Puchiná."
-=======
-\v 30 \v 31 30 Acxní Finees xpalakachiwiná Dios chu mapekgsinanin xalak Israel hua ti akxtum xtaminkgonit, kgaxmatkgolh umá tachiwin tu tachiwina xkamanán Rubén, Gad chu Manasés, akgatakgskgolh. 31 Finees, xkgawasa Eleazar xpalakachiwiná Dios, kawanilh amá xkamanán Rubén, Gad chu Manasés: "Lanchiyu katsinitaw pi wa Puchiná kinkatawilán, wampi wixinan nitu tlawanitantit tu nitlan xlakatín  Puchiná. , Uma puntsú, wixinán lakgmaxtutit xkachikin Israel nakxmakán Puchiná."
->>>>>>> 8a3d0b2cad9058dfb3bb3faea6bb28093f6ebd42
+\v 30 Acxní Finees xpalakachiwiná Dios chu mapekgsinanin xalak Israel hua ti akxtum xtaminkgonit, kgaxmatkgolh umá tachiwin tu tachiwina xkamanán Rubén, Gad chu Manasés, akgatakgskgolh. \v 31 Finees, xkgawasa Eleazar xpalakachiwiná Dios, kawanilh amá xkamanán Rubén, Gad chu Manasés: "Lanchiyu katsinitaw pi wa Puchiná kinkatawilán, wampi wixinan nitu tlawanitantit tu nitlan xlakatín  Puchiná. , Uma puntsú, wixinán lakgmaxtutit xkachikin Israel nakxmakán Puchiná."
\ No newline at end of file
diff --git a/22/32.txt b/22/32.txt
index 75a7525c..d452cc35 100644
--- a/22/32.txt
+++ b/22/32.txt
@@ -1 +1 @@
-\v 32 \v 33 32 Hua chu Finees, xkgawasa xpalakachiwiná Dios Eleazar, chu mapekgsinanin  makgxtakgkgolh rubenitas chu gaditas, nacxtiyath Galaad.  Taspitkgolh nacxtiyah Canaán, tani xwilakgolh xkamanán ISRAEL, chu kaliminikgolh umá tachiwín. 33 Umá tachiwín tlan tlawakgolh xlipacs tachixkuwitat xalac Israel.  Tachixkuwitat xalac Israel matlankikgolh Dios chu nialh talakapastakli nataratlawakgoy  rubenitas chu gaditas, na nialh lakapastakkgolh para namakasputukgoy tiyath tani xtawilana.
\ No newline at end of file
+\v 32 Hua chu Finees, xkgawasa xpalakachiwiná Dios Eleazar, chu mapekgsinanin  makgxtakgkgolh rubenitas chu gaditas, nacxtiyath Galaad.  Taspitkgolh nacxtiyah Canaán, tani xwilakgolh xkamanán ISRAEL, chu kaliminikgolh umá tachiwín. \v 33 Umá tachiwín tlan tlawakgolh xlipacs tachixkuwitat xalac Israel.  Tachixkuwitat xalac Israel matlankikgolh Dios chu nialh talakapastakli nataratlawakgoy  rubenitas chu gaditas, na nialh lakapastakkgolh para namakasputukgoy tiyath tani xtawilana.
\ No newline at end of file
diff --git a/22/34.txt b/22/34.txt
index 922eefbf..8a3df0f4 100644
--- a/22/34.txt
+++ b/22/34.txt
@@ -1 +1 @@
-\v 34 34 Hua rubenitas chu gaditas mapakuwikgolh amá   pulakgatakilhputan " hua umá nalilakapastakaw" sampi xlakán tawá: " wua umá nalilakapastakaw kilakgstipankán, pi wa Puchiná Dios."
\ No newline at end of file
+\v 34 Hua rubenitas chu gaditas mapakuwikgolh amá   pulakgatakilhputan " hua umá nalilakapastakaw" sampi xlakán tawá: " wua umá nalilakapastakaw kilakgstipankán, pi wa Puchiná Dios."
\ No newline at end of file