fixed merges
fixing for heroku
heroku
fix