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