diff --git a/front/title.txt b/front/title.txt
index 68584f4..1ba9642 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Batheselonika
-=======
-1 BATHESALONIKA
->>>>>>> da3528fe0925e6e5826c0ec73e48d66c72a6544c
+1 Batheselonika
\ No newline at end of file