Added .zshrc
Fixed conflict