refactoring shit server and adding Merchant.find