fix merge conflict

src/THcHelicity.cxx

@@ -501,7 +501,6 @@ Int_t THcHelicity::Decode(const THaEvData& evdata) {
         //	cout << fTITime/250000000.0 << " " << fNCycle << " " << fReportedHelicity << endl;
         //	cout << fNCycle << ": " << fReportedHelicity << " "
         //	     << fPredictedHelicity << " " << fActualHelicity << endl;
->>>>>>> 77b916167fbc44bfd82e8c4fe2b063c386e89d99
       }
       // Ignore until a MPS Is found
     } else { // No MPS found yet

src/THcHelicityReader.cxx

@@ -167,7 +167,7 @@ Int_t THcHelicityReader::SetROCinfo(EROC which, Int_t roc, Int_t slot, Int_t ind
   fROCinfo[which].slot  = slot;
   fROCinfo[which].index = index;
 
-  logger_->info("SetROCInfo: {} (roc: {}, slot: {}, index: {})", which, fROCinfo[which].roc,
+  _logger->info("SetROCInfo: {} (roc: {}, slot: {}, index: {})", which, fROCinfo[which].roc,
                 fROCinfo[which].slot, fROCinfo[which].index);
   fHaveROCs = (fROCinfo[kHel].roc > 0 && fROCinfo[kTime].roc > 0 && fROCinfo[kMPS].roc);