diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php
index c4482fbc..f19417cb 100644
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@@ -217,7 +217,6 @@ class UserController
             require($rep . $vues['erreur']);
         }
     }
-<<<<<<< HEAD
     public function launchGame(){
         try {
             global $rep, $vues, $error;
@@ -230,16 +229,6 @@ class UserController
             require($rep . $vues['erreur']);
         }
     }
-=======
-    // public function launchGame(){
-    //     try {
-    //         global $rep, $vues, $error;
-    //         $model = new UserModel();
-    //         $model->launchGame();
-    //         require($rep . $vues['partie']);
-    //     }
-    // }
->>>>>>> ec72c626e295121e440c26605682865659b9012b
     public function logout()
     {
         $_SESSION['role'] = 'visitor';