Further conflict resolution
Update Zsh