Display merge conflicts message when comparing against head

Closes #230991

See merge request gitlab-org/gitlab!39306