[cango] fix merge issue
2013-3-15 work