diff --git a/app.js b/app.js
index 71d7881..cf4e95b 100644
--- a/app.js
+++ b/app.js
@@ -24,21 +24,6 @@ function gain(tirage) {
     if (tirage == [9,9,9]) {
     player_coins = player_coins + machine_coins 
     machine_coins = 0
-<<<<<<< HEAD
-    } else if(tirage[0] == tirage[1] == tirage[2]) {
-        
-    } else if(tirage[0] == tirage[1] || tirage[1] == tirage[2] || tirage[0] == tirage[2]) {
-
-}
-
-
-var button = document.createElement("BUTTON");        
-var button_1 = document.createTextNode("CLICK ME");
-function regle() {       
-    btn.appendChild(button_1);                                
-    document.body.appendChild(button);       
-}
-=======
     } else if (tirage[0] == tirage[1] && tirage[1]== tirage[2]) {
         console.log("E")
     } else if (tirage[0] == tirage[1] || tirage[1] == tirage[2] || tirage[0] == tirage[2]) {
@@ -48,9 +33,14 @@ function regle() {
     }
 }
 
-function regles() {
-    
+
+var button = document.createElement("BUTTON");        
+var button_1 = document.createTextNode("CLICK ME");
+function regle() {       
+    btn.appendChild(button_1);                                
+    document.body.appendChild(button);       
 }
+    
 
 function main() {
     var machine_coins = 1000
@@ -67,4 +57,3 @@ function main() {
 
     }
 }
->>>>>>> ab707c2fcc7fbbba50a93643f30bca75186a5143