update zsh
merged changed