color for conflict
Merge pull request #4 from bluemandora/C2

color for conflict