結果 : undo git pull with merge conflicts