feat(docs): document x-conflicts
Merge pull request #98 from robszumski/master

feat(docs): document x-conflicts