(Almost) unusable "Resolved" button in conflict resolution page

[stefano.menci]

The snapshot below shows the “Resolved” button only partially visible:

[stucork]

Thanks for reporting - we’ll get that fixed