fix merge stash