resolved confilicts

resolved confilicts
removed style

removed style
Sales overview module

Sales overview module
Conflict resolved

Conflict resolved
Create Sweepstakes