update document
fix conflict