resolved merge conflict on branch chris

Merge request reports

Loading