I don't think the conflict marks belong here. This should be fixed before this PR is merged.