github desktop pull request conflict