Fix conflicts in testreport module