fix:conflicts

package.json

@@ -21,7 +21,7 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-radio-group": "^1.2.1",
-    "@radix-ui/react-select": "^2.1.1",
+    "@radix-ui/react-select": "^2.1.2",
     "@radix-ui/react-slot": "^1.1.0",
     "@remix-run/react": "^2.12.1",
     "class-variance-authority": "^0.7.0",
@@ -36,7 +36,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "swr": "^2.2.5",
-    "tailwind-merge": "^2.5.2",
+    "tailwind-merge": "^2.5.3",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.23.8"
   },
@@ -45,8 +45,8 @@
     "@firebase/rules-unit-testing": "^3.0.4",
     "@remix-run/dev": "^2.12.1",
     "@types/bun": "^1.1.10",
-    "@types/lodash": "^4.17.9",
-    "@types/react": "^18.3.10",
+    "@types/lodash": "^4.17.10",
+    "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.20",
     "firebase-tools": "^13.20.2",
@@ -55,7 +55,7 @@
     "typescript": "^5.6.2",
     "vite": "^5.4.8",
     "vite-tsconfig-paths": "^5.0.1",
-    "vitest": "^2.1.1"
+    "vitest": "^2.1.2"
   },
   "engines": {
     "node": ">=20.0.0"