diff --git a/package.json b/package.json
index d7cd99841..999783f54 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "remarkable": "2.0.1",
     "remarkable-react": "1.4.3",
     "sass": "^1.82.0",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.0.0",
     "tailwindcss": "^3.4.16",
     "tailwindcss-animate": "^1.0.7",
     "tsconfig-paths": "^4.2.0"
diff --git a/yarn.lock b/yarn.lock
index 6b2c3a6a7..25260fd27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12200,10 +12200,10 @@ tabbable@^6.0.0:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-6.2.0.tgz#732fb62bc0175cfcec257330be187dcfba1f3b97"
   integrity sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==
 
-tailwind-merge@^2.5.5:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
-  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
+tailwind-merge@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.0.1.tgz#0f0189966511ebcd63ef98d9eaf5607beb0d59d3"
+  integrity sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==
 
 tailwindcss-animate@^1.0.7:
   version "1.0.7"