Fix up conflicts for downstream dependents

Which, really, means the renderer