minor merge glitch