pull request conflict prevents automatic merging