diff --git a/src/THcDetectorBase.cxx b/src/THcDetectorBase.cxx
index a045a8a8514f14d7689d554d646994d759741786..44c79232f6ca44bea097c80ee47a1ecb1748444d 100644
--- a/src/THcDetectorBase.cxx
+++ b/src/THcDetectorBase.cxx
@@ -5,12 +5,6 @@
 // THcDetectorBase
 //
 // Add hitlist to the Hall A detector base
-<<<<<<< HEAD
-//
-//////////////////////////////////////////////////////////////////////////
-
-#include "ThcDetectorBase.h"
-=======
 // May not need to inherit from THaDetectorBase since we may end up
 // replacing most of the methods
 //
@@ -20,7 +14,6 @@
 #include "THaEvData.h"
 #include "THaDetMap.h"
 #include "TClonesArray.h"
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 
 using namespace std;
 
@@ -28,21 +21,15 @@ THcDetectorBase::THcDetectorBase( const char* name,
 				  const char* description ) :
   THaDetectorBase(name, description)
 {
-<<<<<<< HEAD
-=======
   // Normal constructor.
 
   fRawHitList = NULL;
 
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 }
 
 THcDetectorBase::THcDetectorBase() : THaDetectorBase() {
 }
 
-<<<<<<< HEAD
-THcDetectorBase::~THcDetectorBase() : ~THaDetectorBase() {
-=======
 THcDetectorBase::~THcDetectorBase() {
   // Destructor
 }
@@ -109,7 +96,6 @@ Int_t THcDetectorBase::Decode( const THaEvData& evdata ) {
   fRawHitList->Sort(fNRawHits);
 
   return fNRawHits;		// Does anything care what is returned
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 }
 
 ClassImp(THcDetectorBase)
diff --git a/src/THcDetectorBase.h b/src/THcDetectorBase.h
index b83a5c4e722a6ec1b2c1014a7303ec6cbaf0081b..740f7c13f3bf9ac6a958dc01947f738ed98018b8 100644
--- a/src/THcDetectorBase.h
+++ b/src/THcDetectorBase.h
@@ -2,14 +2,11 @@
 #define ROOT_THcDetectorBase
 
 #include "THaDetectorBase.h"
-<<<<<<< HEAD
-=======
 #include "THcRawHit.h"
 #include "TClonesArray.h"
 
 
 using namespace std;
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 
 //////////////////////////////////////////////////////////////////////////
 //
@@ -17,24 +14,12 @@ using namespace std;
 //
 //////////////////////////////////////////////////////////////////////////
 
-<<<<<<< HEAD
-=======
 //class THaDetMap;
 
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 class THcDetectorBase : public THaDetectorBase {
 
  public:
 
-<<<<<<< HEAD
-  virtual ~THaDetectorBase();
-
-  THaDetectorBase(); // only for ROOT I/O
-
- protected:
-
-  ClassDef(ThcDetectorBase,0)
-=======
   virtual ~THcDetectorBase();
 
   THcDetectorBase(); // only for ROOT I/O
@@ -56,6 +41,5 @@ class THcDetectorBase : public THaDetectorBase {
  protected:
 
   ClassDef(THcDetectorBase,0)
->>>>>>> d715b6024d14d1acc253ad0eef3926e5d9f69035
 };
 #endif