docs
merging