some zsh changes
merge conflict fixes