diff --git a/01/title.txt b/01/title.txt
index 42c669a..0924cb2 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capitulo 1
-=======
-CAPÍTULO 1
->>>>>>> 8a92d93a909fc030b1e4984d02f8393178806923
+Capitulo 1
\ No newline at end of file