fixing conflicts with heroku