fixing bad merge in zsh/cygwin.zsh