use the right version
update README
fix merge