stashed and popped changes