diff --git a/front/title.txt b/front/title.txt
index e08d900..a3570fa 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-O Apocalipse
-=======
-Apocalipse
->>>>>>> bf78d0d2272954fc58fa871e929b4239c298c4e7
+O Apocalipse
\ No newline at end of file