back to master without stash