merge heroku