update MerchantActivity to MerchantListActivity