Fix revenue by date
Fix merge conflicts