fix SUMMARY.md merge conflict
Merge branch 'cclaiborne-master'