Port of "Remove merge_conflicts bundle" to EE See merge request gitlab-org/gitlab-ee!4758
Attach a file by drag & drop or click to upload
