Slightly de-clutter the merge editor UI

There has been user feedback to de-clutter the merge editor UI. For example https://twitter.com/shamssahal/status/1567094628515737601 And I agree. Though I am not sure what can we remove. One thing that comes to mind - why don't we hide the editor area where folding is? In the Incoming and Current view, we already do not support folding and with removing this we would save on screen real estate. Just to be clear, the area between line numbers and where the text / conflict starts  Another thing - auto resolved conflicts are too strong. Can we make those checkboxes and the border around those conflicts more subtle? Other ideas welcome fyi @daviddossett