fix heroku merge conflicts