Fix merge conflict in collab (#9550)

Release Notes:

- N/A

Conrad Irwin committed 2y ago

5139aa38117a36e9e55abdcb047b9eafc84c6f45

Parent: 86a86a9

Committed by GitHub <noreply@github.com> on 3/19/2024, 10:02:33 PM