diff --git a/package-lock.json b/package-lock.json
index f48373d5..34dff3a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25112,7 +25112,7 @@
         "shiki": "^4.0.2",
         "streamdown": "^2.5.0",
         "stripe": "^17.7.0",
-        "tailwind-merge": "^3.0.0",
+        "tailwind-merge": "^3.6.0",
         "three": "^0.172.0",
         "use-stick-to-bottom": "^1.1.3",
         "zustand": "^5.0.0"
@@ -25612,6 +25612,16 @@
         "node": ">=20"
       }
     },
+    "packages/app/node_modules/tailwind-merge": {
+      "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",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
     "packages/app/node_modules/tinyexec": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz",
@@ -25819,7 +25829,7 @@
         "react-dom": "^19.0.0",
         "remark-gfm": "^4.0.1",
         "shiki": "^4.0.2",
-        "tailwind-merge": "^3.0.0",
+        "tailwind-merge": "^3.6.0",
         "three": "^0.172.0",
         "zustand": "^5.0.0"
       },
@@ -26645,6 +26655,16 @@
         "node": ">=20"
       }
     },
+    "packages/docs/node_modules/tailwind-merge": {
+      "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",
+        "url": "https://github.com/sponsors/dcastil"
+      }
+    },
     "packages/docs/node_modules/tailwindcss": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.4.tgz",
diff --git a/packages/app/package.json b/packages/app/package.json
index 4e6adb58..5f47ec95 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -65,7 +65,7 @@
     "shiki": "^4.0.2",
     "streamdown": "^2.5.0",
     "stripe": "^17.7.0",
-    "tailwind-merge": "^3.0.0",
+    "tailwind-merge": "^3.6.0",
     "three": "^0.172.0",
     "use-stick-to-bottom": "^1.1.3",
     "zustand": "^5.0.0"
diff --git a/packages/docs/package.json b/packages/docs/package.json
index c20ee555..5a9efdcb 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -32,7 +32,7 @@
     "react-dom": "^19.0.0",
     "remark-gfm": "^4.0.1",
     "shiki": "^4.0.2",
-    "tailwind-merge": "^3.0.0",
+    "tailwind-merge": "^3.6.0",
     "three": "^0.172.0",
     "zustand": "^5.0.0"
   },