fix conflict glitch