diff --git a/apps/inaba-jinja/package.json b/apps/inaba-jinja/package.json
index 0f8ec3721..e6f0fcccf 100644
--- a/apps/inaba-jinja/package.json
+++ b/apps/inaba-jinja/package.json
@@ -22,7 +22,7 @@
     "next": "^15.1.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "tailwind-merge": "^2.6.0"
+    "tailwind-merge": "^3.0.1"
   },
   "description": "The source code for the Inaba Jinja.",
   "devDependencies": {
diff --git a/packages/components/package.json b/packages/components/package.json
index 2d72a8f31..627917df6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -35,7 +35,7 @@
   "peerDependencies": {
     "@types/react": "^19.0.0",
     "react": "^19.0.0",
-    "tailwind-merge": "^2.2.1"
+    "tailwind-merge": "^2.2.1 || ^3.0.0"
   },
   "peerDependenciesMeta": {
     "@types/react": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3857f9fe6..0c2e78c72 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -203,8 +203,8 @@ importers:
         specifier: ^19.0.0
         version: 19.0.0(react@19.0.0)
       tailwind-merge:
-        specifier: ^2.6.0
-        version: 2.6.0
+        specifier: ^3.0.1
+        version: 3.0.1
     devDependencies:
       '@inaba-jinja/tailwind-config':
         specifier: workspace:*
@@ -409,8 +409,8 @@ importers:
         specifier: ^19.0.0
         version: 19.0.0
       tailwind-merge:
-        specifier: ^2.2.1
-        version: 2.6.0
+        specifier: ^2.2.1 || ^3.0.0
+        version: 3.0.1
     devDependencies:
       '@tsconfig/node20':
         specifier: ^20.1.4
@@ -8932,8 +8932,8 @@ packages:
   tabbable@5.3.3:
     resolution: {integrity: sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==}
 
-  tailwind-merge@2.6.0:
-    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
+  tailwind-merge@3.0.1:
+    resolution: {integrity: sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==}
 
   tailwindcss-safe-area@0.6.0:
     resolution: {integrity: sha512-5PM3CKquzmaa6mow64zWJ0438/yGSqdPfjaXtwNDb31LezNWqFoGPSbvrW12T8iB4EBjeWot+qAA9nbUqqf3sw==}
@@ -20211,7 +20211,7 @@ snapshots:
 
   tabbable@5.3.3: {}
 
-  tailwind-merge@2.6.0: {}
+  tailwind-merge@3.0.1: {}
 
   tailwindcss-safe-area@0.6.0(tailwindcss@3.4.17):
     dependencies: