eliminate bad merge
fix merge conflict with heroku master