diff --git a/stack-updater/stack_updater.yml b/stack-updater/stack_updater.yml
index 51d3d05e42341d6ae1c0ce93ed8fc08e86604f7b..d17862aa56868b1bd5f6c6a1f033e8387374005e 100644
--- a/stack-updater/stack_updater.yml
+++ b/stack-updater/stack_updater.yml
@@ -23,7 +23,7 @@ update:
       - git checkout ${branch}
       - git pull
       - git branch --set-upstream-to=origin/${branch} ${branch}
-      - git merge -s ours $current_version
+      - git merge -X theirs $current_version
       - git remote rm origin && git remote add origin "https://${access_token_name}:${access_token}@git.code.tecnalia.com/${CI_PROJECT_PATH}.git"
       - git push --follow-tags --set-upstream origin ${branch}
       - node package-version-updater/updateGitlabSide.js --cV $current_version --nV $next_version -p $CI_PROJECT_ID -t $access_token