diff --git a/23/title.txt b/23/title.txt
index 5758ae5b..c7078535 100644
--- a/23/title.txt
+++ b/23/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 23
-=======
-Capitulo 23
->>>>>>> 13e7a10a2e75fe58d1b7c9aafa7c08ecd8f53302
+Capitulo 23
\ No newline at end of file