Remove another stray merge conflict marking