CLI conflicts reporting

...and things around :)

Alexey