commit adding zsh
merging