fixed merge glitch