fixed more issues from git stash