diff --git a/package-lock.json b/package-lock.json
index cc6239c..94e352b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "react-dom": "^19.0.0",
         "react-markdown": "^10.1.0",
         "remark-gfm": "^4.0.1",
-        "tailwind-merge": "^2.2.0",
+        "tailwind-merge": "^3.5.0",
         "zustand": "^5.0.0"
       },
       "devDependencies": {
@@ -7231,7 +7231,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
+      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/package.json b/package.json
index dc36834..052486b 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "react-dom": "^19.0.0",
     "react-markdown": "^10.1.0",
     "remark-gfm": "^4.0.1",
-    "tailwind-merge": "^2.2.0",
+    "tailwind-merge": "^3.5.0",
     "zustand": "^5.0.0"
   },
   "devDependencies": {