Untested zsh install
fix conflict
merge conflict
fix line breaks