fix incorrect composer conflict

Merge request reports

Loading