conflicts for vendor
cleared conflicts for vendor