renamed report.txt to report
merge