diff --git a/05/title.txt b/05/title.txt
index ef90c3e..7c3a093 100644
--- a/05/title.txt
+++ b/05/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 5
-=======
-capítulo 5
->>>>>>> 751a3d41da02c71c8abf768bac02506ad4368f0d
+Capítulo 5
\ No newline at end of file