intermediat stuff
fixing merge conflict
intermediate commit for coupons