diff --git a/front/title.txt b/front/title.txt
index a74b709..d68311f 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Johane
-=======
-Johane umbhabhatisi
->>>>>>> 192c7ec6153eab78ae98e152bd2a4579e2a1487d
+Johane
\ No newline at end of file