testing stash merge