Fix remnant merge conflict