Removing the conflicts before deploying to heroku