working on heroku
fixed merge