diff --git a/app.js b/app.js
index 1145438..9e36693 100644
--- a/app.js
+++ b/app.js
@@ -40,11 +40,7 @@ function nbAlea() {
   function regles() {
     /* affiche les regles dans la page HTML */
       // console.log(toggle_rules);
-<<<<<<< HEAD
       let rules = document.getElementById('show_rules')
-=======
-      let rules = document.querySelector('.show_rules')
->>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74
       if (toggle_rules == true) {
           rules.style.display = "none"
       } else {
diff --git a/icon.jpg b/icon.jpg
deleted file mode 100644
index 4b96f57..0000000
Binary files a/icon.jpg and /dev/null differ
diff --git a/index.html b/index.html
index dec0813..7ea62f3 100644
--- a/index.html
+++ b/index.html
@@ -8,12 +8,5 @@
 	</head>
 
 	<body>
-<<<<<<< HEAD
-=======
-        <div>
-            <a href="machine.html"><h2>MACHINE</h2></a>
-            <a href="machine.html"><h2>A SOUS NSI</h2></a>
-        </div>
->>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74
     </body>
 </html>
diff --git a/logo.png b/logo.png
deleted file mode 100644
index 3f3c214..0000000
Binary files a/logo.png and /dev/null differ
diff --git a/machine.docx b/machine.docx
deleted file mode 100644
index 65e10c9..0000000
Binary files a/machine.docx and /dev/null differ
diff --git a/machine.html b/machine.html
index d376b5e..b87a4d6 100644
--- a/machine.html
+++ b/machine.html
@@ -38,7 +38,6 @@ etc...
             <h2>machine coins : <h2 id="machine_coins"> </h2></h2>
             <h2>player coins : <h2 id="player_coins"> </h2></h2>
             <input id="mise">
-<<<<<<< HEAD
             <p id="gain"></p>
         </div>
 		<div id="show_rules">
@@ -53,15 +52,7 @@ etc...
               Dans tous les cas sauf le jackpot, le joueur perd sa mise<br>
               Bien évidemment, pour ne pas vous anarquer, si le bac possède moins de 500 jetons, alors le jeu s'arrêtera<br>
               Et puis il faut également pas oublier que si vous n'avez plus de jeton, alors vous ne pourrez plus jouer</p>
-		</div>
-=======
-            <p id="show_rules"></p>
-            <p id="gain"></p>
-        </div>
-
-        <img src="logo.png" alt="logo" class="logo">
->>>>>>> d1a4734fc13ee6f8aec91b3ddd2193fa2a9a3f74
-
+			  
         <script src="app.js"></script>
     </body>
 </html>
diff --git a/style.css b/style.css
deleted file mode 100644
index d292ea7..0000000
--- a/style.css
+++ /dev/null
@@ -1,10 +0,0 @@
-body {
-    background-color: rgb(233, 245, 255);
-}
-.rouleaux {
-    display: flex;
-    flex-direction: row;
-}
-.rouleaux h3 {
-    margin: 0 5px 0 5px;
-}
\ No newline at end of file
diff --git a/stylepagecss/menu.css b/stylepagecss/menu.css
index 9da93fe..fd753f7 100644
--- a/stylepagecss/menu.css
+++ b/stylepagecss/menu.css
@@ -107,14 +107,8 @@ button:hover {
 #show_rules {
   position: relative;
   display: none;
-  position: absolute;
-  left: 20%;
-  right: 20%;
-  top: 5%;
-  bottom: 20%;
-  z-index: 1;
   background-color: #fff;
-  box-shadow: 5px 5px 500px 500px #000;
+  
 }
 
 #show_rules > p {
