resolve conflicts

Author: yaoweiprc

package-lock.json

@@ -53,7 +53,6 @@
     "@getinsomnia/srp-js": "1.0.0-alpha.1",
     "@grpc/grpc-js": "^1.13.3",
     "@grpc/proto-loader": "^0.7.13",
-    "@mismerge/core": "^1.2.1",
     "@react-router/fs-routes": "^7.9.4",
     "@react-router/node": "^7.9.4",
     "@react-router/serve": "^7.9.4",