Merge conflicts fixed

package.json

@@ -33,7 +33,7 @@
     "@headlessui/react": "^1.7.19",
     "@ladjs/country-language": "^1.0.3",
     "@marsidev/react-turnstile": "^0.7.1",
-    "@movie-web/providers": "github:sussy-code/providers",
+    "@movie-web/providers": "github:ztpn/smovproviders#wyzie",
     "@noble/hashes": "^1.4.0",
     "@plasmohq/messaging": "^0.6.2",
     "@react-spring/web": "^9.7.3",
@@ -65,7 +65,7 @@
     "react-helmet-async": "^2.0.5",
     "react-i18next": "^14.1.2",
     "react-lazy-with-preload": "^2.2.1",
-    "react-router-dom": "^6.24.0",
+    "react-router-dom": "^6.23.1",
     "react-sticky-el": "^2.1.0",
     "react-use": "^17.5.0",
     "semver": "^7.6.2",
@@ -85,7 +85,7 @@
     "@types/lodash.isequal": "^4.5.8",
     "@types/lodash.merge": "^4.6.9",
     "@types/lodash.throttle": "^4.1.9",
-    "@types/node": "^20.14.9",
+    "@types/node": "^20.14.8",
     "@types/pako": "^2.0.3",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
@@ -124,7 +124,7 @@
     "tailwindcss-themer": "^4.0.0",
     "type-fest": "^4.20.1",
     "typescript": "^5.5.2",
-    "vite": "^5.3.2",
+    "vite": "^5.3.1",
     "vite-plugin-checker": "^0.6.4",
     "vite-plugin-package-version": "^1.1.0",
     "vite-plugin-pwa": "^0.17.5",