Update documentation
Fixed merge conflict