Resolved documentation merge conflicts.