結果 : github pull request resolve merge conflict