Heroku specs
Fixed conflicts for heroku.