resolve conflicts

demo/redirect-flow-example/package.json

@@ -6,13 +6,6 @@
     "@tkey/common-types": "^15.0.2",
     "@toruslabs/tss-dkls-lib": "^4.0.0",
     "@toruslabs/tss-frost-lib": "^1.0.0",
-<<<<<<< Updated upstream
-    "@vitejs/plugin-react": "^4.3.2",
-    "@web3auth/base": "^9.0.2",
-    "@web3auth/ethereum-mpc-provider": "^9.0.2",
-    "@web3auth/mpc-core-kit": "file:../../web3auth-mpc-core-kit-3.2.3.tgz",
-    "assert": "^2.1.0",
-=======
     "@types/jest": "^27.5.2",
     "@types/node": "^16.18.48",
     "@types/react": "^18.2.21",
@@ -23,7 +16,6 @@
     "browserify-zlib": "^0.2.0",
     "copy-webpack-plugin": "^11.0.0",
     "html-webpack-plugin": "^5.5.3",
->>>>>>> Stashed changes
     "jsonwebtoken": "^8.5.1",
     "jsrsasign": "^10.6.1",
     "react": "^18.3.1",