Switched to "stash pop" to avoid accumulating changes in cache