changelog merge glitch fix