diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 585d3ac504..5057457a5b 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -35,12 +35,8 @@
     "dist/"
   ],
   "dependencies": {
-<<<<<<< HEAD
-    "@ionic/react": "^7.6.2",
-    "history": "^4.9.0",
-=======
     "@ionic/react": "^7.6.6",
->>>>>>> origin/main
+    "history": "^4.9.0",
     "tslib": "*"
   },
   "peerDependencies": {