remove merge conflicts
ready for heroku