Added report to file
resolved conflict