diff --git a/07/38.txt b/07/38.txt
index e895cd30..47dba801 100644
--- a/07/38.txt
+++ b/07/38.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\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
-=======
-\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.
->>>>>>> 12067a4fad40fd5604f561c0107ad22642b267de
+\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
diff --git a/manifest.json b/manifest.json
index 772c359b..b1c22582 100644
--- a/manifest.json
+++ b/manifest.json
@@ -39,7 +39,8 @@
 		"RAMON D ALVARADO BURGOS",
 		"Vanesa de los Angeles Martínez Hernández",
 		"damaso jose reyna rondon",
-		"leidy"
+		"leidy",
+		"Michael A. Rodriguez"
 	],
 	"finished_chunks": [
 		"07-17",