fix merge issus

Signed-off-by: huangqiwu <huangqiwu@xiaomi.com>