fix problems with zshrc merge conflicts