Fix merge glitches