diff --git a/10/title.txt b/10/title.txt
index b05b207..80ff40b 100644
--- a/10/title.txt
+++ b/10/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Chapitala 10
-=======
-Chapita 10
->>>>>>> 6bc2dc843202c2fa4f47fac3a8db432d3ef8993b
+Chapitala 10
\ No newline at end of file