fixing heroku errors
merge conflicts