stash these various changes to rebase