diff --git a/front/title.txt b/front/title.txt
index ed6d0fe..ba6ac06 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Yohanna 1
-=======
-1Yohanna
->>>>>>> a9145faac24c5433daedc878bfbe2a0eba34ef9c
+1Yohanna
\ No newline at end of file