fix small conflict
Signed-off-by: Li Mi <limisky@gmail.com>