small merge glitch