diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5efaee7..5ee6aa2 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -16,7 +16,7 @@
         "react-markdown": "^10.1.0",
         "reactflow": "^11.11.4",
         "remark-gfm": "^4.0.1",
-        "tailwind-merge": "^2.5.4",
+        "tailwind-merge": "^3.6.0",
         "zustand": "^4.5.5"
       },
       "devDependencies": {
@@ -4298,9 +4298,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.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz",
+      "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/frontend/package.json b/frontend/package.json
index 03aea8a..b7cc5e6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,7 +18,7 @@
     "react-markdown": "^10.1.0",
     "reactflow": "^11.11.4",
     "remark-gfm": "^4.0.1",
-    "tailwind-merge": "^2.5.4",
+    "tailwind-merge": "^3.6.0",
     "zustand": "^4.5.5"
   },
   "devDependencies": {