merge a few edits

Merge request reports

Loading