Heroku master reconcile