結果 : git resolve conflict using command line