Deploying to heroku
Solve the conflict