fix conflict in .zshrc