diff --git a/cryptide_project/package-lock.json b/cryptide_project/package-lock.json
index e138573..7b4fea2 100644
--- a/cryptide_project/package-lock.json
+++ b/cryptide_project/package-lock.json
@@ -27,7 +27,16 @@
         "react-intl": "^6.5.2",
         "react-router-dom": "^6.18.0",
         "react-scripts": "5.0.1",
+<<<<<<< HEAD
         "react-switch": "^7.0.0",
+=======
+<<<<<<< HEAD
+        "socket.io": "^4.7.2",
+        "socket.io-client": "^4.7.2",
+=======
+        "react-switch": "^7.0.0",
+>>>>>>> 3d3d620 (ajout de dépendances pour un switch et stub dans les params de jeu :package:)
+>>>>>>> 65f2cb6 (ajout de dépendances pour un switch et stub dans les params de jeu :package:)
         "typescript": "^5.2.2",
         "vis-network": "^9.1.9",
         "web-vitals": "^2.1.4"
diff --git a/cryptide_project/package.json b/cryptide_project/package.json
index 3c29664..30df0cc 100644
--- a/cryptide_project/package.json
+++ b/cryptide_project/package.json
@@ -21,12 +21,9 @@
     "react-intl": "^6.5.2",
     "react-router-dom": "^6.18.0",
     "react-scripts": "5.0.1",
-<<<<<<< HEAD
     "react-switch": "^7.0.0",
-=======
     "socket.io": "^4.7.2",
     "socket.io-client": "^4.7.2",
->>>>>>> af92727 (Début du serveur)
     "typescript": "^5.2.2",
     "vis-network": "^9.1.9",
     "web-vitals": "^2.1.4"
diff --git a/cryptide_project/src/Pages/InGame.tsx b/cryptide_project/src/Pages/InGame.tsx
index 3df1915..ce87883 100644
--- a/cryptide_project/src/Pages/InGame.tsx
+++ b/cryptide_project/src/Pages/InGame.tsx
@@ -89,7 +89,7 @@ const InGame = ({locale, changeLocale}) => {
       window.open(url);
     };
   
-
+  const [SwitchEnabled, setSwitchEnabled] = useState(false)
   const indices = Stub.GenerateIndice()
 
     return (