[cango] fix merge issue