fixed zsh-highlighting git conflict