github desktop resolve pull request conflicts

約100件中 41 - 80件