fix git stash merge faults