fixed errors in merchant class