Make merge conflicts more manageable

[Torxed]

Select Topic Area

Bug

Body

Hi.

While working on resolving conflicts on a PR, the "Mark as resolved" button keeps disappearing in larger merge conflicts and this is a nightmare to deal with in the web UI. Ideally you'll work locally, but having the option to work on this in the browser is neat and just lack one little thing.. Access to the "mark as resolved" button once you're done with resolving the conflict.

The issue is that you have to find a pixel that isn't within a scrollbox in order to scroll up to the top.
If the file-tree is in scroll-mode you have to scroll that to the top as well before you can get to the button.

Would be nice to consider having the "Mark as resolved" sticky on the top or something.