diff --git a/renovate.json b/renovate.json
index 7190a60..66a44d2 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,3 +1,14 @@
+<<<<<<< HEAD
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json"
 }
+=======
+{ 
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [ "local>cicd/renovate" ],
+  "ansible": {
+    "fileMatch": [ "(.*).ya?ml$" ]
+  }
+}
+
+>>>>>>> 919b0e0 ([ci] feat: added renovate configuration)