diff --git a/15/24.txt b/15/24.txt
index b4c1a0c..c84e101 100644
--- a/15/24.txt
+++ b/15/24.txt
@@ -1 +1,5 @@
-\v 24 Ña as wẽhpri arwã tish aakri untasma chilera apaskri, taña un tasña asnani ta wishkitii, to' achiwish kayo' taña õshkri ima pesh kuanzaró akasna kakii. \v 25 Ima akenma, untas krí'ró unta'aaki \v 26 Arwä̃ akamasprá katunhápiro payó  askenyowá untaste amados  bernabé to' pablo,   arwã õihsitishkri ekapesh kaooró to apin untaste Señor Jesucristo .
\ No newline at end of file
+<<<<<<< HEAD
+\v 24 Ña as wẽhpri arwã tish aakri untasma chilera apaskri, taña un tasña asnani ta wishkitii, to' achiwish kayo' taña õshkri ima pesh kuanzaró akasna kakii. \v 25 Ima akenma, untas krí'ró unta'aaki \v 26 Arwä̃ akamasprá katunhápiro payó  askenyowá untaste amados  bernabé to' pablo,   arwã õihsitishkri ekapesh kaooró to apin untaste Señor Jesucristo .
+=======
+\v 24 Ña as wẽhpri arwã tish aakri untasma chilera apaskri, taña un tasña asnani ta wishkitii, to' achiwish kayo' taña õshkri ima pesh kuanzaró akasna kakii. \v 25 Ima akenma, untas krí'ró unta'aaki \v 26 Arwä̃ akamasprá katunhápiro payó  askenyowá untaste amados  bernabé to' pablo,   arwã õihsitishkri ekapesh kaooró to apin untaste señor jescristo .
+>>>>>>> ab918715c523563ebd073ff8ec10b20a890de6f7
diff --git a/manifest.json b/manifest.json
index 2ba41be..050ba87 100644
--- a/manifest.json
+++ b/manifest.json
@@ -34,7 +34,9 @@
 	"parent_draft": {},
 	"translators": [
 		"Juan_HRomeroC",
-		"MAST Mosquitia 2024"
+		"MAST Mosquitia 2024",
+		"Carla Abarza",
+		"abarza"
 	],
 	"finished_chunks": [
 		"front-title",
@@ -269,7 +271,6 @@
 		"15-15",
 		"15-19",
 		"15-22",
-		"15-24",
 		"15-27",
 		"15-30",
 		"15-33",