refactored some of the page conflict view by making a small commit partial