diff --git a/code/index.html b/code/index.html
index d20c69f..eddd855 100644
--- a/code/index.html
+++ b/code/index.html
@@ -6,9 +6,6 @@
     </head>
 
     <body>
-<<<<<<< HEAD
-        [INSERER LA SAE]
-=======
         <header>
 
         </header>
@@ -18,6 +15,5 @@
         <footer>
 
         </footer>
->>>>>>> 8774af8a4ebcf99adcb9e61d552cfb9190551f1c
     </body>
 </html>
\ No newline at end of file
