Resolving merge conflicts from a previous commit
Modifying receipt selection for active clients
Initial page for My Clients
Fixing merge conflicts