CRM-13379 fix merge bug