Update zshrc
merge