Heroku merge