added merchant scaffold