stash
stash testing done
adding a new file
rebase test