updates to zshrc
merge