Button bar in conflict resolver has incorrect Z-index

Take a merge request that has a conflict and then attempt to resolve it. You'll see the button bar on top of everything: