結果 : undo git pull merge conflict