conflict reporting

more from conflict reporting