Fix stray merge conflict marker causing failed build