heroku merge