Allow conflicts to be merged in diff See merge request gitlab-org/gitlab!45008
Attach a file by drag & drop or click to upload
