update doc
resolve conflict