Revert "Merge conflict fix"

This reverts commit 8c4894fd

Merge request reports

Loading