Conflicts can be resolved by running
`bundle exec rake gettext:find; git checkout locale/*/gitlab.po`