Fix merge glitch