Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23297
Attach a file by drag & drop or click to upload
