diff --git a/05/01.txt b/05/01.txt
index e25aa300..1bc4d298 100644
--- a/05/01.txt
+++ b/05/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 5 \v 1 Keyenja pjia iyakaljekualjiko jerusalen, pjioma tsaka yakalje iplazanaljiko,pirsotsa piwaupiaka ,,pitjaitakada pioketaka Apadaa Atsiaa O Apadaa Jinjaitakada Matsia ,,Niniwatsa Noperdona jerusalen, \v 2 Nintsa Nakaiteka ,, kafiadaljika WAMINALJI,, Mikatsa Nakashatakatsa \v 3 WAMINALJI,¿kapapja kurrika pitji ikapa ljiañji Ajadalji?  Imaa pjirapitetjaka Nañji iniaki ,Mikatsa kuriika kaiwi Nañji pjiamjeninanja padenjirii, Mitsa kuriimintua Njauma nepapjakaa ,taimikayaopja njaekua kaiñji  jipadasho,kuriin nauma njadiakawa,
-=======
-\c 5 \v 1 Keyenja Pjia jerusalen Iyaljiekuanljiko ,Nite yumatsaka Nayakalje Iplazariiko  ,nite ikapja ljiañji ,,itjaitakada yuketaka Apadaa Atsia  O Apadaa Jinaitakada Matsia Nite Mayakandalji ,Niniwatsa Noperdona jerusalen, \v 2 \v 3
->>>>>>> 186300da86c71b1f9b0fbb5125c9f44648306063
+\c 5 \v 1 Keyenja pjia iyakaljekualjiko jerusalen, pjioma tsaka yakalje iplazanaljiko,pirsotsa piwaupiaka ,,pitjaitakada pioketaka Apadaa Atsiaa O Apadaa Jinjaitakada Matsia ,,Niniwatsa Noperdona jerusalen, \v 2 Nintsa Nakaiteka ,, kafiadaljika WAMINALJI,, Mikatsa Nakashatakatsa \v 3 WAMINALJI,¿kapapja kurrika pitji ikapa ljiañji Ajadalji?  Imaa pjirapitetjaka Nañji iniaki ,Mikatsa kuriika kaiwi Nañji pjiamjeninanja padenjirii, Mitsa kuriimintua Njauma nepapjakaa ,taimikayaopja njaekua kaiñji  jipadasho,kuriin nauma njadiakawa,
\ No newline at end of file
diff --git a/05/title.txt b/05/title.txt
index 3e9a68d8..7c3a0935 100644
--- a/05/title.txt
+++ b/05/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 5
-=======
-Capitulo 5
->>>>>>> 186300da86c71b1f9b0fbb5125c9f44648306063
+Capítulo 5
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index c8f2acc3..f56889e8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -86,6 +86,7 @@
 		"04-23",
 		"04-27",
 		"04-30",
+		"05-01",
 		"05-04",
 		"05-07",
 		"05-10",