Merchant WIP for Big Decimal and Revenue by date
fixed merge conflicts