comments consistency
Use standard light gray color for the git branch

Fixes #5
Fixed the merge conflicts