Update documentation
resolve conf
Update documentation