Fixed UI issues in merge conflict app See merge request gitlab-org/gitlab!47916
Attach a file by drag & drop or click to upload
