fix wrong merge conflict resolution

Merge request reports

Loading