Improved (?) conflict merging. When we have no idea about order, interlace the clocks.  * test fails because compare only currently looks at the last term. Need to change that.
More test cases for the bounded_version_vector::merge(). Attempt to reorder conflicts so we don't preserve as much information as possible (given that some of it has to be dropped).