diff --git a/01/title.txt b/01/title.txt
index cb34bf7..cf8f437 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 6
-=======
-Capítulo 1
->>>>>>> c81656b3305cd0a287de650fb742facf22660092
+Capítulo 1
\ No newline at end of file