better wording
Merge branch 'master' into heroku
fix
Merge branch 'master' into heroku