Git Abort Merge From Stash