add documentation
resolve merge conflict