merge conflicts in zshrc
merge conflicts in zshrc