diff --git a/07/17.txt b/07/17.txt
index 9bd4791..7c64d38 100644
--- a/07/17.txt
+++ b/07/17.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 17 \v 19 K'alal le nopol yorail ya xk'ot ta pasel te bina smelelil yaloj te Diose ta stojol te Abraham, te lum yak ta ch'iel sok yak ta esmajel ta Ejipto.
-\v 18 Ja to k'alal och yan ajwalil ta Ejipto, ja jun ajwalil te ma snabeysba te José.
-=======
-\v 17 \v 18 \v 19 Ja in muk' aj walilto la slo'lay te lamaltike sok tulan la yuts'in te namey jme'- jtatike, jich albotik te ja'uk  ya yak'ik ta milel te aletik yu'unike  jich me ya xkuxinika
->>>>>>> e4dbd8aced58729f0308db97c9d5b1435ad66c14
+\v 17 \v 19 K'alal le nopol yorail ya xk'ot ta pasel te bina smelelil yaloj te Diose ta stojol te Abraham, te lum yak ta ch'iel sok yak ta esmajel ta Ejipto. \v 18 Ja to k'alal och yan ajwalil ta Ejipto, ja jun ajwalil te ma snabeysba te José.
\ No newline at end of file
diff --git a/07/38.txt b/07/38.txt
index 9b24f5e..47dba80 100644
--- a/07/38.txt
+++ b/07/38.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 38 \v 39 \v 40 Sa la yalbeyik te Aorone: PASBOTIK KAJKANANTIK SWENTA YU'UN YA XME-ELAJ TA BE-EL KU-UN TIKA,JA MA NATIK  TE BILA LA SPAS TE MOISESS TE JA LA SLOK'ESOTIK TEL TA SLUMAL EGIPTO.
-=======
-\v 38 \v 40 ja nix te moises te ay ta tsoble ta bay jochol takin k'inal sok te ch'ul abat te k'oponot yu'un ta bay wits sinai .soku-uk te chich mamiletik,sok te la yich' te k'opetik yu'un te kuxinel te la yak' botike \v 39 Ja'uk me to te chich-mamtik nameye ma la sk'an yich'beyik ta muk' te smantal te moisese sok la sk'e sbaik lok'el ta stojol sok la sk'an yot'anik te ya sujt'ikbael ta lam ejiptoe
->>>>>>> e4dbd8aced58729f0308db97c9d5b1435ad66c14
+\v 38 \v 39 \v 40 Sa la yalbeyik te Aorone: PASBOTIK KAJKANANTIK SWENTA YU'UN YA XME-ELAJ TA BE-EL KU-UN TIKA,JA MA NATIK  TE BILA LA SPAS TE MOISESS TE JA LA SLOK'ESOTIK TEL TA SLUMAL EGIPTO.
\ No newline at end of file