diff --git a/package.json b/package.json
index 9b55d20160..ca5d856991 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
     "react-wrap-balancer": "1.1.0",
     "remove-markdown": "0.5.0",
     "socket.io-client": "4.7.2",
-    "tailwind-merge": "1.14.0",
+    "tailwind-merge": "2.0.0",
     "uniqolor": "1.1.0",
     "xss": "1.0.14"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 85fa7b654f..e606bd5be1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -141,8 +141,8 @@ dependencies:
     specifier: 4.7.2
     version: 4.7.2
   tailwind-merge:
-    specifier: 1.14.0
-    version: 1.14.0
+    specifier: 2.0.0
+    version: 2.0.0
   uniqolor:
     specifier: 1.1.0
     version: 1.1.0
@@ -7110,6 +7110,13 @@ packages:
 
   /tailwind-merge@1.14.0:
     resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
+    dev: true
+
+  /tailwind-merge@2.0.0:
+    resolution: {integrity: sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==}
+    dependencies:
+      '@babel/runtime': 7.23.2
+    dev: false
 
   /tailwind-scrollbar@3.0.5(tailwindcss@3.3.5):
     resolution: {integrity: sha512-0ZwxTivevqq9BY9fRP9zDjHl7Tu+J5giBGbln+0O1R/7nHtBUKnjQcA1aTIhK7Oyjp6Uc/Dj6/dn8Dq58k5Uww==}