stray merge conflict