fix stash merge