#495 - Best deal conflicts between order and order item offers that are not combinable