trying to get heroku working
resolved conflict