merging with local stash