Show the Merge Conflict warning when there are conflicts and the UI is showing the full diff

See merge request gitlab-org/gitlab!63806