Improve CLI output for conflicts

Replace white color with green.
Merge pull request #1284 from niksy/improve-cli-color-output

Improve CLI output for conflicts