diff --git a/WEB/Controller/UserController.php b/WEB/Controller/UserController.php
index eab6b1cb..468be61c 100644
--- a/WEB/Controller/UserController.php
+++ b/WEB/Controller/UserController.php
@@ -217,6 +217,7 @@ class UserController
             require($rep . $vues['erreur']);
         }
     }
+<<<<<<< HEAD
     public function launchGame(){
         try {
             global $rep, $vues, $error;
@@ -229,6 +230,16 @@ 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';
diff --git a/WEB/View/src/pages/LogSign/Login.php b/WEB/View/src/pages/LogSign/Login.php
index 210c9aa6..47e17338 100644
--- a/WEB/View/src/pages/LogSign/Login.php
+++ b/WEB/View/src/pages/LogSign/Login.php
@@ -28,7 +28,7 @@
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/4.1.1/animate.min.css"
     />
-    <link rel="stylesheet" href="./View/src/CSS/LogSign.css" />
+    <link rel="stylesheet" href="/Web/View/src/CSS/LogSign.css" />
     <link
       rel="stylesheet"
       href="https://fonts.googleapis.com/icon?family=Material+Icons"