update readme
fixed conflict