diff --git a/index.html b/index.html
index 2721701..b9aa036 100644
--- a/index.html
+++ b/index.html
@@ -9,13 +9,7 @@
 </header>
 <body>
         <h1> Bienvenue sur le site</h1>
-<<<<<<< HEAD
-<<<<<<< HEAD
 	<p> blabla </p>
-=======
-	<section> Contact </section>
->>>>>>> feature/contact
-=======
 	<section> Contact </section>
 >>>>>>> 9b10867 (section contact)
 </body>
