diff --git a/32/title.txt b/32/title.txt
index c9186299..9f979d37 100644
--- a/32/title.txt
+++ b/32/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capitulo 32
-=======
-Capítulo 32
->>>>>>> d91ba108295786cd5ee9220cf50ac7757d7eb03e
+Capítulo 32
\ No newline at end of file