Issue #1317626: Followup to docs updates to remove merge conflicts.
Merge pull request #267 from quicksketch/fix-merges

Issue #1317626: Followup to docs updates to remove merge conflicts.