結果 : github use command line to resolve conflicts