Fixed overlapping issues.

Merge request reports

Loading