set to serve static assets in production
fixed merge conflict