updated zshrc
Merge