Clean up conflicts