SERVER-15198 fix merge issue