add missing from merge conflict

Merge request reports

Loading