github desktop pull request conflicts