diff --git a/renovate.json b/renovate.json
index d948ce6..c189c51 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}
-=======
 { 
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "dependencyDashboard": true,
@@ -10,5 +5,3 @@
     "local>siempie/renovate"
   ]
 }
-
->>>>>>> 10d2a6d ([renovate] feat: added config)