Fixed doc conflict