結果 : revert git pull with conflicts