diff --git a/mentions-legales.html b/mentions-legales.html
index 8683dcb..18dd205 100644
--- a/mentions-legales.html
+++ b/mentions-legales.html
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <!DOCTYPE html>
 <html lang="fr">
 
@@ -24,33 +23,4 @@
         </div>
     </header>
 </body>
-
-=======
-<!DOCTYPE html>
-<html lang="fr">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mentions Légales</title>
-    <link rel="icon" type="image/x-icon" href="_content/favicon-32x32.png">
-    <link rel="stylesheet" href="style/style_main.css">
-</head>
-
-<body>
-    <header>
-        <h1><a class="_title" href="index.html"><span class="word1">Pop</span><span class="word3">Op</span></a></h1>
-        <ul>
-            <li><a href="#unlinked">Top</a></li>
-            <li><a href="#unlinked">Musiques</a></li>
-            <li><a href="#unlinked">Lectures</a></li>
-        </ul>
-        <div>
-            <a href="sign_in.php">Se connecter</a>
-            <a href="sign_up.php">S'inscrire</a>
-        </div>
-    </header>
-</body>
-
->>>>>>> d120872e658c0bb2df803f19a903096b4a6a7928
 </html>
\ No newline at end of file
