結果 : git resolve conflict using theirs command line