Prepared for heroku
Fixed conflict