resolve confict after master rebasing
update readme