removed prom-night from merchant#show