update oh-my-zsh, add z
merge