fix the CM merge