Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
Attach a file by drag & drop or click to upload
