resolved conflict in report.