Heroku branch merge