Undo latest pull a git merge with conflicts

-