Explain pkg repos conflicting, how to diagnose, and how to resolve.
I don't feel strongly about where this needs to go. The best place would
be pkgbasify(8), but we don't have that. Maybe UPDATING? I'm not sure we
shouldn't modify this a bit and put this in top level pkg(8)?
I also removed some trivial typos mandoc complains about in this commit.
MFC after: 3 days