improve documentation
fix conflict