update to v3.1.1 docs
update readme.md
fix conflict