github desktop resolve pull request conflict

約100件中 161 - 199件