Before Heroku
Fixed conflicts