Added Merchant Test Most Revenue Fixed Merge Conflict