OP-4611 another pesky merge conflict