updated merchant#show