more docs
resolve merge conflict