fixed merge when poped stash