fix conflict for Readme
Signed-off-by: Guohua Ouyang <ouyanggh0815@gmail.com>