Heroku settings adjustment
Fix merge conflict