diff --git a/src/THcHelicity.cxx b/src/THcHelicity.cxx
index 7203fc69bd98e765450dd5cbcd227a1f71e28398..15fd0e5797b042b416997a82f214c36ac699ba17 100644
--- a/src/THcHelicity.cxx
+++ b/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
diff --git a/src/THcHelicityReader.cxx b/src/THcHelicityReader.cxx
index c0e18929d0c5f91863706f561f1a8cabbf555ba9..3dfa4ddca5d9f40fb4870da2b97b3b404291a3d5 100644
--- a/src/THcHelicityReader.cxx
+++ b/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);