diff --git a/front/title.txt b/front/title.txt
index 34b55e5..b6b100b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-EFESUS
-=======
-efesus
->>>>>>> 9c5c650e8c100933d7784f05d5ff57bb0b7904ea
+efesus
\ No newline at end of file