Pgd/5/consistency/column level conflicts/docs 287

[jpe442]

What Changed?

Split up the column-level conflicts page into separate pages. Integrated the notes section of the original page into the split up pages. Fixed any links broken by the splitting-up process.