diff --git a/12/01.txt b/12/01.txt
index 3dd0436..e062d51 100644
--- a/12/01.txt
+++ b/12/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 12 \v 1 Ja yu'un, te bit'il juytabilotik yu'un testigoetik, aka me jkik'itaytik jilel spisil te yalal sok te oranax ya xch'ayotik koel ta bay mulil. Junuk me jkot'antik yakuk x-ailmajotik ta bay yakotik bael. \v 2 Jauk me ya jkiltik te Jesus, ja te mach'a ne'elto la yak'botik sok te mach'a ya slektes te xch'uunjel jkot'antik. \v 3 Melel sok sbujt's yot'an la yak'sba ta jip'anel ta cruz, mayuk sk'oplal la yay te sk'exlal
-=======
-\c 12 \v 1 Jich yu´un, te joy tabilotik yu´un  te testigietik te la yak´ikix ta ilel te ay xch´unjel yot´anik kijtetik jilel spisil te jkijkatstik sok te mulil te vueltanax ya xchukotik. Animajukotik bael ta banti xk´ootik te jo´otike. \v 2 Ja me ya jtojlintik sitik ta Jesús te ja ne´el sok tojteswane, yu´un te xch´unjel ot´anil. Ta skaj te sbujts´ yot´an te la stik swokol te la yich´milel ta cruz, la sts´ik xh´exlal jich la snajk´anba ta swael sk´ab te Dios ta banti muk´ul natijib. \v 3 Jich yu´unito na´ameik, te ja ts´ijk yu´un te kontroinot te mulawiletike. Yu´un jich me ma spejk´tsaj awot´anih yu´unjich ma awichik tsalet.
->>>>>>> d84d358f22096704c53191ce25e3551c8f590680
+\c 12 \v 1 Jich yu´un, te joy tabilotik yu´un  te testigietik te la yak´ikix ta ilel te ay xch´unjel yot´anik kijtetik jilel spisil te jkijkatstik sok te mulil te vueltanax ya xchukotik. Animajukotik bael ta banti xk´ootik te jo´otike. \v 2 Ja me ya jtojlintik sitik ta Jesús te ja ne´el sok tojteswane, yu´un te xch´unjel ot´anil. Ta skaj te sbujts´ yot´an te la stik swokol te la yich´milel ta cruz, la sts´ik xh´exlal jich la snajk´anba ta swael sk´ab te Dios ta banti muk´ul natijib. \v 3 Jich yu´unito na´ameik, te ja ts´ijk yu´un te kontroinot te mulawiletike. Yu´un jich me ma spejk´tsaj awot´anih yu´unjich ma awichik tsalet.
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index cacfba0..85980e0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -43,7 +43,8 @@
 		"PEDRO JESUS MENDEZ LOPEZ",
 		"Michael Rodriguez",
 		"Maria delos Angeles Mendez Lopez",
-		"Lucy Rios"
+		"Lucy Rios",
+		"Michael A. Rodriguez"
 	],
 	"finished_chunks": [
 		"front-title",
@@ -160,6 +161,16 @@
 		"11-35",
 		"11-39",
 		"12-title",
+		"12-01",
+		"12-04",
+		"12-07",
+		"12-09",
+		"12-12",
+		"12-14",
+		"12-18",
+		"12-22",
+		"12-25",
+		"12-27",
 		"13-title",
 		"13-01",
 		"13-03",
@@ -171,14 +182,6 @@
 		"13-18",
 		"13-20",
 		"13-22",
-		"13-24",
-		"12-07",
-		"12-09",
-		"12-12",
-		"12-14",
-		"12-18",
-		"12-22",
-		"12-25",
-		"12-27"
+		"13-24"
 	]
 }
\ No newline at end of file