opps\!
update documentation
fix conflict