new versions of docs
merge