Product Assortment and Price Competition Under Multinomial Logit Demand