Heroku

fixes merge conflicts with master on heroku