diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2b144d6..44aad49 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,7 +23,7 @@
         "react-router-dom": "^6.21.1",
         "recharts": "^2.10.3",
         "socket.io-client": "^4.7.3",
-        "tailwind-merge": "^2.2.1",
+        "tailwind-merge": "^3.5.0",
         "zustand": "^4.4.7"
       },
       "devDependencies": {
@@ -6140,9 +6140,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
-      "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
+      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/frontend/package.json b/frontend/package.json
index 201b744..b8f79b6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -25,7 +25,7 @@
     "react-router-dom": "^6.21.1",
     "recharts": "^2.10.3",
     "socket.io-client": "^4.7.3",
-    "tailwind-merge": "^2.2.1",
+    "tailwind-merge": "^3.5.0",
     "zustand": "^4.4.7"
   },
   "devDependencies": {