simply code and add readme
update readme
fix merge conflict