Added table to the report
Conflict resolving