Improve CLI output for conflicts

When using light theme for CLI interface, white color can’t be easily distinguished. This PR replaces white text color with the green one which will easily work with both types of themes.

Before:
![screen shot 2014-05-07 at 19 35 46](https://cloud.githubusercontent.com/assets/389286/2906228/54c21e2e-d60e-11e3-8ff2-f197f9fbae8b.png)

After:
![screen shot 2014-05-07 at 19 36 01](https://cloud.githubusercontent.com/assets/389286/2906229/588c7950-d60e-11e3-8f41-26d53f68906b.png)