Merge Conflict’s match collection

dev in rio. no deploys on flamengo matchdays, company policy (mine)