diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbb9750f14ff9880223200ad275039c468a1987c..b28ae1da1015f036874db769618f3332a1829d8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -81,9 +81,8 @@ commits:
    - git config --global user.email "$CI_EMAIL" && git config --global user.name "$CI_USER"
    - 'exists=`git show-ref refs/heads/$CI_COMMIT_REF_NAME` && if [ -n "$exists" ]; then git branch -D $CI_COMMIT_REF_NAME; fi'
    - 'if [ -d ".git/rebase-apply" ]; then rm -fr .git/rebase-apply; fi'
-   - git pull --rebase origin $CI_COMMIT_REF_NAME
-   # Use this pull command if there are merge conflicts during rebase /!\ it will keep the changes in the Pro repository !
-#   - git pull -s recursive -X theirs --no-edit origin $CI_COMMIT_REF_NAME
+#   - git pull --rebase origin $CI_COMMIT_REF_NAME
+   - git pull -s recursive -X ours --no-edit origin $CI_COMMIT_REF_NAME
    - git checkout -b $CI_COMMIT_REF_NAME
    - git push origin --all