Update documents
Fix conflict