update MerchantsActivity to MerchantActivity