Fix up conflicts