Fix up conflicts in the renderer