Update documentation
remove conflicts