I have chosen not to, actually – when conflicts occur, I note down both instances and simply make note of it, my intention being simply to catalogue, rather than attempt to fix; my reasoning being that this document be used as a resource, or perhaps an index in a sense, by the folks who wish to...