Fix bad merge

MSP-10856