diff --git a/renovate.json b/renovate.json
index 20f9fee..bf6daa8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,10 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "local>Trez/renovate-config"
-<<<<<<< HEAD
   ],
   "enabledManagers": ["terraform"]
-=======
-  ]
->>>>>>> refs/remotes/origin/renovate/configure
 }