diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..3c597254
--- /dev/null
+++ b/.github/mergify.yml
@@ -0,0 +1,34 @@
+pull_request_rules:
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=destogl
+      - author!=christophfroehlich
+      - author!=saikishor
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
+            to have these changes reflected into new distributions.
diff --git a/codecov.yml b/codecov.yml
index ac6e323a..08b92203 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -9,10 +9,6 @@ coverage:
     patch: off
 fixes:
   - "ros_ws/src/control_toolbox/::"
-ignore:
-  - "**/test"
-  - "test"
-  - "test/**/*"
 comment:
   layout: "diff, flags, files"
   behavior: default