Synced merchant client>server
Revised the merchant system