diff --git a/front/title.txt b/front/title.txt
index 4cdd081..4d1c36b 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Wana muwanaucin
-=======
-Wana Muwanaucin
->>>>>>> 4d1e20943b02aa166f25872e1270bc620446b4eb
+Wana Muwanaucin
\ No newline at end of file