diff --git a/06/title.txt b/06/title.txt
index 87cfec4a..f5c1ea56 100644
--- a/06/title.txt
+++ b/06/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 6
-=======
-Capitulo 6
->>>>>>> d0c47a11a5978d9ef1156a0cb00f04827c2f04ac
+Capitulo 6
\ No newline at end of file
diff --git a/38/title.txt b/38/title.txt
index 18a3ea94..50fb7507 100644
--- a/38/title.txt
+++ b/38/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capitulo 38
-=======
-Capítulo 38
->>>>>>> 425ff75c569ca5bca9ace19906b1f84d9e1e4ab7
+Capítulo 38
\ No newline at end of file