heroku-merge-plugin added
Merge branch 'master' of https://github.com/oveo/heroku-merge-plugin