diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index 86441a263edac2821fad1c2aaa7dc69aed4dc84e..4c30129c26f28b93dc3f6af3478e5bb05eb2ce09 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -558,7 +558,6 @@ Int_t THcHodoscope::DefineVariables(EMode mode) {
   // Register variables in global list
 
   RVarDef vars[] = {
-<<<<<<< src/THcHodoscope.cxx
     // Move these into THcHallCSpectrometer using track fTracks
     {"beta",       "Beta including track info",                "fBeta"},
     {"betanotrack",       "Beta from scintillator hits",                "fBetaNoTrk"},
@@ -579,22 +578,6 @@ Int_t THcHodoscope::DefineVariables(EMode mode) {
      { 0 }
   };
   return DefineVarsFromList( vars, mode );
-=======
-      // Move these into THcHallCSpectrometer using track fTracks
-      {"beta", "Beta including track info", "fBeta"},
-      {"betanotrack", "Beta from scintillator hits", "fBetaNoTrk"},
-      {"betachisqnotrack", "Chi square of beta from scintillator hits", "fBetaNoTrkChiSq"},
-      {"fpHitsTime", "Time at focal plane from all hits", "fFPTimeAll"},
-      {"starttime", "Hodoscope Start Time", "fStartTime"},
-      {"goodstarttime", "Hodoscope Good Start Time (logical flag)", "fGoodStartTime"},
-      {"goodscinhit", "Hit in fid area", "fGoodScinHits"},
-      {"TimeHist_Sigma", "", "fTimeHist_Sigma"},
-      {"TimeHist_Peak", "", "fTimeHist_Peak"},
-      {"TimeHist_Hits", "", "fTimeHist_Hits"},
-      {0}};
-
-  return DefineVarsFromList(vars, mode);
->>>>>>> src/THcHodoscope.cxx
   //  return kOK;
 }
 //_____________________________________________________________________________