initial
update readme
fix merge errors