added merchant spawn