Merge in Dev Discount