fix conflict

Signed-off-by: Young Shook <pumianwuya@163.com>