Resolving heroku conflicts