settle merge conflict with zshrc