Clarify order-dependent conflict resolutions.

Closes #1337. [ci skip]