Stray merge conflicts