fix merge conflicts in zshrc