heroku changes
fixed merge conflicts