diff --git a/packages/devtools-ui/package.json b/packages/devtools-ui/package.json
index 5bccfe46..10d700de 100644
--- a/packages/devtools-ui/package.json
+++ b/packages/devtools-ui/package.json
@@ -47,7 +47,7 @@
     "react-icons": "^5.5.0",
     "recharts": "^2.15.1",
     "sonner": "^2.0.2",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.0.0",
     "tw-animate-css": "^1.2.5",
     "vaul": "^1.1.2",
     "zod": "^3.24.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 43a0caa2..5518e543 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -386,8 +386,8 @@ importers:
         specifier: ^2.0.2
         version: 2.0.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0)
       tailwind-merge:
-        specifier: ^2.5.5
-        version: 2.6.0
+        specifier: ^3.0.0
+        version: 3.3.0
       tw-animate-css:
         specifier: ^1.2.5
         version: 1.2.5
@@ -7561,8 +7561,8 @@ packages:
     engines: {node: '>=14.0.0'}
     hasBin: true
 
-  tailwind-merge@2.6.0:
-    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
+  tailwind-merge@3.3.0:
+    resolution: {integrity: sha512-fyW/pEfcQSiigd5SNn0nApUOxx0zB/dm6UDU/rEwc2c3sX2smWUNbapHv+QRqLGVp9GWX3THIa7MUGPo+YkDzQ==}
 
   tailwindcss@3.4.17:
     resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==}
@@ -16843,7 +16843,7 @@ snapshots:
       csso: 5.0.5
       picocolors: 1.1.1
 
-  tailwind-merge@2.6.0: {}
+  tailwind-merge@3.3.0: {}
 
   tailwindcss@3.4.17:
     dependencies: