update doc
merge