g stash merge