fixed merchant spawn