Update documentation
conflic