merge conflicts in zshrc