diff --git a/02/title.txt b/02/title.txt
index d35511b..93cdb36 100644
--- a/02/title.txt
+++ b/02/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 2
-=======
-Capitulos 2
->>>>>>> 2aa3ce899de38fb5ea0fbb44c73346bf379cdfcc
+Capitulos 2
\ No newline at end of file