Clarify order-dependent conflict resolutions.

Closes #1337. [ci skip]
Reformat FAQ.md's markdown to be a little more shell-friendly.