merging heroku stuff