merge for heroku