base_merchant.xml reverted