removed double entry
Merge branch 'develop' into feature-discount-cleanup