結果 : undo git pull with conflicts