* changes: Serialize ConflictsCache as proto ConflictKey: Add tests for order normalizing behavior Add helper method for parsing protos with unchecked exceptions Add a helper for serializing ObjectIds to protobuf Use ProtoTruth#assertThat in more places