Stash merge fix.