結果 : git resolve conflicts between branch and master