heroku toolbelt
merge conflicts