trying to deploy to heroku
debug is false
fixing merge conflict