Two conflicts, both additions at the same spot: NetworkOPs.cpp include block kept develop's rpc/detail/SyntheticFields.h alongside this branch's telemetry/MetricsRegistry.h; .cspell.config.yaml kept both new words.