replaced oh-my-zsh with prezto
fixed merge conflict: