diff --git a/package.json b/package.json
index d2af4d80a..c04463f6f 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "pnpm": "10.7.0",
     "prisma-erd-generator": "2.0.4",
     "svelte-eslint-parser": "1.1.1",
-    "tailwind-merge": "2.6.0",
+    "tailwind-merge": "3.1.0",
     "tailwindcss": "3.4.17",
     "vercel": "41.4.1",
     "xss": "1.0.15"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d25f77fa0..d07bd6df3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,8 +63,8 @@ importers:
         specifier: 1.1.1
         version: 1.1.1(svelte@5.25.5)
       tailwind-merge:
-        specifier: 2.6.0
-        version: 2.6.0
+        specifier: 3.1.0
+        version: 3.1.0
       tailwindcss:
         specifier: 3.4.17
         version: 3.4.17(ts-node@10.9.1(@types/node@22.13.14)(typescript@5.6.3))
@@ -4193,6 +4193,9 @@ packages:
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
+  tailwind-merge@3.1.0:
+    resolution: {integrity: sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==}
+
   tailwind-variants@0.3.1:
     resolution: {integrity: sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==}
     engines: {node: '>=16.x', pnpm: '>=7.x'}
@@ -8892,6 +8895,8 @@ snapshots:
 
   tailwind-merge@2.6.0: {}
 
+  tailwind-merge@3.1.0: {}
+
   tailwind-variants@0.3.1(tailwindcss@3.4.17(ts-node@10.9.1(@types/node@22.13.14)(typescript@5.6.3))):
     dependencies:
       tailwind-merge: 2.5.4