fix merge failure by git stash