coflict resolution
fixed Product.by_vendor