diff --git a/package-lock.json b/package-lock.json
index 5eadd76..f23f4e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
         "react-dom": "^18.3.1",
         "react-resizable-panels": "^4.11.0",
         "sql-formatter": "^15.7.3",
-        "tailwind-merge": "^3.5.0",
+        "tailwind-merge": "^3.6.0",
         "zustand": "^5.0.12"
       },
       "devDependencies": {
@@ -4644,9 +4644,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
-      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
+      "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/package.json b/package.json
index 245257a..2b0a1fd 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "react-dom": "^18.3.1",
     "react-resizable-panels": "^4.11.0",
     "sql-formatter": "^15.7.3",
-    "tailwind-merge": "^3.5.0",
+    "tailwind-merge": "^3.6.0",
     "zustand": "^5.0.12"
   },
   "devDependencies": {