merge heroku 3