update documentation
resolve merge conflict