doc
fix conflict