attempting to get on heroku
merge conflicts fixed