diff --git a/front/title.txt b/front/title.txt
index 9706abc..d1f8f7e 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Hakim-hakim
-=======
-Hakim -hakim
->>>>>>> e0443045391cd1766295e9debbbd9290a7ebeaf2
+Hakim-hakim
\ No newline at end of file