Merge heroku branch