merge with heroku