hopefully solved the Heroku bug
solved git conflicts