diff --git a/renovate.json b/renovate.json
index 2cbe1c8..7190a60 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,15 +1,3 @@
 {
-<<<<<<< HEAD
   "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-=======
-  "extends": [
-    "config:base"  
-  ],
-  "packageRules": [
-    {
-      "updateTypes": ["minor", "patch", "pin", "digest"],
-      "automerge": true
-    }
-  ]
->>>>>>> 223f4c6 (fixed pinterest icon and link)
 }