Give explicit branch to push to on Heroku
Merge branch 'master' into develop