Add a note about merge conflicts in `gitlab.pot`

See merge request gitlab-org/gitlab-ce!16971