resolving some nasty buggy event behaviour
stash to pull
stashing again