resolved heroku conflicts