fixed conflict
Merge pull request #54 from CodePath-MAF/revert-cashoverview

fixed conflict