merging with heroku files