Move merge_conflicts to page specific styles

What does this MR do?

This MR moves the merge_conflicts.scss to a page specific bundle

Screenshots

🎉 It works Screen_Shot_2020-10-02_at_10.15.12_AM
🎉 Even in dark mode Screen_Shot_2020-10-02_at_10.14.48_AM
🐛 There's a preexisting issue where the button text isn't visible in "None" highlighting selected. Screen_Shot_2020-10-02_at_9.42.39_AM

Does this MR meet the acceptance criteria?

Conformity

References

Edited by Paul Slaughter

Merge request reports

Loading