trying to fix heroku
fixed merge conflicts