Merge heroku