diff --git a/package.json b/package.json
index 39dabc3..027c67e 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
 		"svelte-boring-avatars": "^1.2.6",
 		"svelte-hero-icons": "^5.2.0",
 		"svelte-persisted-store": "^0.12.0",
-		"tailwind-merge": "^2.5.5",
+		"tailwind-merge": "^3.0.2",
 		"typewriter-editor": "^0.12.9",
 		"virtua": "^0.35.1",
 		"zod": "^3.24.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1949794..a7cf2e5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,8 +36,8 @@ importers:
         specifier: ^0.12.0
         version: 0.12.0(svelte@4.2.19)
       tailwind-merge:
-        specifier: ^2.5.5
-        version: 2.5.5
+        specifier: ^3.0.2
+        version: 3.0.2
       typewriter-editor:
         specifier: ^0.12.9
         version: 0.12.9(svelte@4.2.19)
@@ -1812,8 +1812,8 @@ packages:
   tabbable@6.2.0:
     resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
 
-  tailwind-merge@2.5.5:
-    resolution: {integrity: sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==}
+  tailwind-merge@3.0.2:
+    resolution: {integrity: sha512-l7z+OYZ7mu3DTqrL88RiKrKIqO3NcpEO8V/Od04bNpvk0kiIFndGEoqfuzvj4yuhRkHKjRkII2z+KS2HfPcSxw==}
 
   tailwindcss@4.0.14:
     resolution: {integrity: sha512-92YT2dpt671tFiHH/e1ok9D987N9fHD5VWoly1CdPD/Cd1HMglvZwP3nx2yTj2lbXDAHt8QssZkxTLCCTNL+xw==}
@@ -3555,7 +3555,7 @@ snapshots:
 
   tabbable@6.2.0: {}
 
-  tailwind-merge@2.5.5: {}
+  tailwind-merge@3.0.2: {}
 
   tailwindcss@4.0.14: {}