Fix merge conflict in collab (#9550)

Release Notes:

- N/A
5139aa3811Conrad Irwin committed on 3/19/2024, 10:02:33 PM· committed by GitHubparent86a86a9
1 file changedLine totals unavailable