Fix stray merge conflict