Removes the merge_conflicts webpack bundle and rolls its functionality into pages/projects/merge_requests/conflicts/index.js instead.
merge_conflicts
pages/projects/merge_requests/conflicts/index.js
Part of gitlab-org/gitlab-ce#41341