added discount page
merge