Undo diff with master branch