結果 : github use the command line to resolve conflicts before continuing