Fixing merge conflicts locally for www-gitlab-com