diff --git a/web-ui/package-lock.json b/web-ui/package-lock.json
index 5bf59520..bd257232 100644
--- a/web-ui/package-lock.json
+++ b/web-ui/package-lock.json
@@ -31,7 +31,7 @@
         "react-markdown": "^10.1.0",
         "sonner": "^2.0.7",
         "swr": "^2.4.1",
-        "tailwind-merge": "^2.2.0"
+        "tailwind-merge": "^3.6.0"
       },
       "devDependencies": {
         "@eslint/eslintrc": "^3.3.5",
@@ -10724,9 +10724,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/web-ui/package.json b/web-ui/package.json
index 5fbc5dd2..e40a2dce 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -38,7 +38,7 @@
     "react-markdown": "^10.1.0",
     "sonner": "^2.0.7",
     "swr": "^2.4.1",
-    "tailwind-merge": "^2.2.0"
+    "tailwind-merge": "^3.6.0"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.5",