diff --git a/radar-app/package.json b/radar-app/package.json
index 819d895..59cdda7 100644
--- a/radar-app/package.json
+++ b/radar-app/package.json
@@ -24,11 +24,7 @@
     "@types/react-dom": "^19",
     "clsx": "^2.1.1",
     "eslint": "^9.23.0",
-<<<<<<< HEAD
     "eslint-config-next": "16.1.6",
-=======
-    "eslint-config-next": "15.2.4",
->>>>>>> main
     "fuse.js": "^7.1.0",
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.11.1",
@@ -36,11 +32,7 @@
     "lint-staged": "^15.5.0",
     "marked": "^15.0.7",
     "marked-highlight": "^2.2.1",
-<<<<<<< HEAD
     "next": "16.1.6",
-=======
-    "next": "15.2.4",
->>>>>>> main
     "postcss-nested": "^7.0.2",
     "postcss-preset-env": "^10.1.5",
     "prettier": "^3.5.3",