解决冲突问题

Signed-off-by: mypgether <913385255@qq.com>