Revert "Fix merge conflicts"

This reverts commit bfb648e8

Merge request reports

Loading