Revise merge-conflict modal text See merge request gitlab-org/gitlab!80666
Attach a file by drag & drop or click to upload
