結果 : resolve pull request conflicts github desktop