merging changes for stash pop