Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
Attach a file by drag & drop or click to upload
