Heroku Conflict Fix