We're moving from merging + reverting to only merging with the `ours`
strategy, removing the need for merge requests or reverting conflicts.
For more details, refer to Merge Train merge request
https://gitlab.com/gitlab-org/merge-train/merge_requests/6.