updated zshrc
merging