github desktop resolve conflicts pull request