Usability improvement: Placement, visibility and readability of merge conflict buttons

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

The resolution buttons during a merge conflict for "use ours" / "use theirs" are hard to find, read and click. They should be placed better so they're easier to find, easier to read and to click.