Merge branch 'staging' into dependabot/npm_and_yarn/staging/eslint-9.16.0

Author: gkorland

package-lock.json

@@ -31,7 +31,7 @@
     "react-resizable-panels": "^2.0.20",
     "react-syntax-highlighter": "^15.6.1",
     "react-type-animation": "^3.2.0",
-    "tailwind-merge": "^2.2.0",
+    "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "web-tree-sitter": "^0.22.6"
   },