commit apply discount
update promotion
switch to issue#15
update issue#14
checkout to issue#16
update
update
fixes show merge table name
success
Merge branch 'issue#16' into issue#14