updated report
resolved conflict in report