MDL-44118 question engine: Fix bad merge conflict resolution (again)