Remove zsh git prompt
merging changes from other machines