changes to stash
accept changes from the repo