Updated the report.
Fixed merge issues.