add basic conflicts test
CLI conflicts reporting