2719 | @@ -2721,9 +2720,10 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) {
2720 | ThresholdState state = checker.GetStateFor(pindex, chainParams.GetConsensus(), warningcache[bit]);
2721 | if (state == THRESHOLD_ACTIVE || state == THRESHOLD_LOCKED_IN) {
2722 | if (state == THRESHOLD_ACTIVE) {
2723 | - strMiscWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
2724 | + string strWarning = strprintf(_("Warning: unknown new rules activated (versionbit %i)"), bit);
Maybe std::string to preempt silent merge conflicts?