git:stash,merge