Are there points in the code the reviewer needs to double check?
Previous implementation has been refactored almost from the ground up.
Also some components like parallel-conflict-lines has been optimized to work well with PhantomJS.
The app and files required files are loaded only when needed. merge_conflicts_bundle.js is only loaded in /<group>/<project>/merge_requests/<Id>/conflicts only
Why was this MR needed?
Some MRs were unable to be solved interactively in the UI, with this MR we let the user to manually fix complex merge request conflicts.
