diff --git a/renovate.json b/renovate.json
index b54a1d0..499f9a3 100644
--- a/renovate.json
+++ b/renovate.json
@@ -20,7 +20,7 @@
       "minimumReleaseAge": "7 days",
       "minimumReleaseAgeBehaviour": "timestamp-required",
       "internalChecksFilter": "strict",
-      "rebaseWhen": "never",
+      "rebaseWhen": "conflicted",
       "automergeSchedule": [
         "on sunday"
       ]