Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
Attach a file by drag & drop or click to upload
