doc
fixed doc conflict