add get by zhiqiang
resolve confilcs