fix new merchant bug