fix merge glitch