Resolve .zshrc conflict