Oops, fix merge conflict