Merge things from heroku-buildpack-nodejs