add stash pop for keeping local changes