fix problems after merge

Merge request reports

Loading