merged changes from stash