Minor UI issue - Button alignment on Merge Request page

In the Merge Request page, when there are merge conflicts, there are two buttons that appear: Resolve conflicts and Merge locally. These are not aligned correctly.

image

Using: GitLab.com

Assignee Loading
Time tracking Loading