github desktop resolve pull request conflicts

約100件中 161 - 199件