docs: clarify multiple x-conflicts per unit
Merge pull request #834 from robszumski/master

docs: clarify multiple x-conflicts per unit