Fixed glitch in zsh prompt

Fixed the merge conflict indicator (lightning bolt) in the git section
of the zsh prompt.