update readme
fixed merge