diff --git a/ui/package-lock.json b/ui/package-lock.json
index d26fdca3..3ce5cf16 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -23,7 +23,7 @@
         "react-dom": "^19.0.0",
         "react-hook-form": "^7.53.1",
         "sonner": "^1.7.4",
-        "tailwind-merge": "^2.5.4",
+        "tailwind-merge": "^3.1.0",
         "tailwindcss-animate": "^1.0.7",
         "vaul": "^1.1.1",
         "zod": "^3.23.8"
@@ -6752,9 +6752,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.1.0.tgz",
+      "integrity": "sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/ui/package.json b/ui/package.json
index 1e6a4e14..c9b8e38c 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -27,7 +27,7 @@
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.53.1",
     "sonner": "^1.7.4",
-    "tailwind-merge": "^2.5.4",
+    "tailwind-merge": "^3.1.0",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^1.1.1",
     "zod": "^3.23.8"