conflicts fixed for heroku deploy