How to cancel or undo git pull merge conflicts