diff --git a/21/title.txt b/21/title.txt
index b640283..f143f30 100644
--- a/21/title.txt
+++ b/21/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 21
-=======
-Capitulo 21
->>>>>>> 937d3b8d601102ec18f89f5e909ed8606ff68f19
+Capitulo 21
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 3be5e22..de2971a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -178,7 +178,6 @@
 		"08-17",
 		"08-20",
 		"08-22",
-		"08-25",
 		"08-27",
 		"08-29",
 		"08-31",