One conflict, in SpanGuard.h: this branch added struct TraceBytes and upstream added enum SpanRole at the same position after TraceCategory. Unrelated declarations, so both are kept.
explicit
SHAMapNodeID::isPrefixOf