diff --git a/tasks/collect_config/finish/gitlabflow.yml b/tasks/collect_config/finish/gitlabflow.yml
index e5c94206636cb08540988d82c85784fc53a2bb32..c8089038927276b56f080b470b50695b548ac378 100644
--- a/tasks/collect_config/finish/gitlabflow.yml
+++ b/tasks/collect_config/finish/gitlabflow.yml
@@ -32,10 +32,12 @@
           target_branch: main
           title: Merging develop into main for collected config
       register: merge_request
+      when: '"nothing to commit, working tree clean" not in git_status.stdout'
 
     - name: Pause
       pause:
         seconds: 5
+      when: '"nothing to commit, working tree clean" not in git_status.stdout'
 
     - name: Merge
       uri:
@@ -47,6 +49,7 @@
         body_format: form-urlencoded
         body:
           should_remove_source_branch: 0
+      when: '"nothing to commit, working tree clean" not in git_status.stdout'
 
   tags:
     - deploy