<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/contributor-success/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Close this issue](https://contributors.gitlab.com/manage-issue?action=close&projectId=278964&issueIid=426715) </details> <!--IssueSummary end--> 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.