Resolved doc conflict