update docs
merge changes