pull request conflicts github