解决冲突

Signed-off-by: Li Yonglei <liyonglei@fuego.cn>