The consensus conflict type has been in use for a little while, but
without unit tests. There are now unit tests to confirm the correctness
of the ConsensusConflict helper functions and general usage.