[4o6] fix merge issue