diff --git a/xAOD/xAODTruth/xAODTruth/TruthEvent.h b/xAOD/xAODTruth/xAODTruth/TruthEvent.h
index b8420dd68f7b2476bb1ebcc889f6683c2adf69c9..695f2eeb097704ae456024cb78084ceb9918c85b 100644
--- a/xAOD/xAODTruth/xAODTruth/TruthEvent.h
+++ b/xAOD/xAODTruth/xAODTruth/TruthEvent.h
@@ -11,10 +11,6 @@
 #include "xAODBase/ObjectType.h"
 
 // Local include(s):
-<<<<<<< HEAD
-=======
-#include "xAODTruth/TruthEventBase.h"
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 #include "xAODTruth/TruthParticleContainer.h"
 #include "xAODTruth/TruthVertexContainer.h"
 
@@ -182,12 +178,9 @@ namespace xAOD {
       /// Pointer to the incoming primary particle
       const TruthParticle* primaryParticle() const;
 
-<<<<<<< HEAD
       /// Get the link to the primary particle
       const TruthParticleLink_t& primaryParticleLink() const;
 
-=======
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
       /// Set incoming primary particle
       void setPrimaryParticleLink( const TruthParticleLink_t& pcl);
 
@@ -195,8 +188,7 @@ namespace xAOD {
 
       /// The type of the object as a simple enumeration
       virtual Type::ObjectType type() const;
-<<<<<<< HEAD
-      
+
       /// @name Simple truth meta data properties 
       /// @{
 
@@ -207,8 +199,6 @@ namespace xAOD {
       void setWeightNames( const std::vector< std::string >& value );
 
       /// @}
-=======
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
       /// Function making sure that the object is ready for persistification
       void toPersistent();
@@ -217,11 +207,4 @@ namespace xAOD {
 
 } // namespace xAOD
 
-<<<<<<< HEAD
-=======
-// Declare the base class of TruthEvent to StoreGate:
-#include "xAODCore/BaseInfo.h"
-SG_BASE( xAOD::TruthEvent, SG::AuxElement );
-
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 #endif // XAODTRUTH_TRUTHEVENT_H
diff --git a/xAOD/xAODTruth/xAODTruth/TruthParticle.h b/xAOD/xAODTruth/xAODTruth/TruthParticle.h
index ecf3ed4d80b0806b08020cb1232c8a6172993935..3a230b018d4e8ad54afe337312efe6de18b1aa34 100644
--- a/xAOD/xAODTruth/xAODTruth/TruthParticle.h
+++ b/xAOD/xAODTruth/xAODTruth/TruthParticle.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHPARTICLE_H
 #define XAODTRUTH_TRUTHPARTICLE_H
 
@@ -357,24 +356,5 @@ namespace xAOD {
    }; // class TruthParticle
 
 } // namespace xAOD
-=======
-// -*- C++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef XAODTRUTH_TRUTHPARTICLE_H
-#define XAODTRUTH_TRUTHPARTICLE_H
-
-#include "xAODTruth/versions/TruthParticle_v1.h"
-
-namespace xAOD {
-
-  /// Typedef to implementation
-  typedef TruthParticle_v1 TruthParticle;
-
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 #endif
diff --git a/xAOD/xAODTruth/xAODTruth/TruthParticleAuxContainer.h b/xAOD/xAODTruth/xAODTruth/TruthParticleAuxContainer.h
index 20032bf8cc1cc7fa4b0a868a65847b15082b4c15..ca8ec36160eec199005d0f664863ae426d4e74cb 100644
--- a/xAOD/xAODTruth/xAODTruth/TruthParticleAuxContainer.h
+++ b/xAOD/xAODTruth/xAODTruth/TruthParticleAuxContainer.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
 #define XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
 
@@ -40,25 +39,6 @@ namespace xAOD {
   }; // class TruthParticleAuxContainer
 
 } // namespace xAOD
-=======
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TruthParticleAuxContainer.h 622193 2014-10-16 16:08:34Z krasznaa $
-#ifndef XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
-#define XAODTRUTH_TRUTHPARTICLEAUXCONTAINER_H
-
-// Local include(s):
-#include "xAODTruth/versions/TruthParticleAuxContainer_v1.h"
-
-namespace xAOD {
-   /// Declare the latest version of the truth particle auxiliary container
-   typedef TruthParticleAuxContainer_v1 TruthParticleAuxContainer;
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 // Declare a CLID for the class
 #include "xAODCore/CLASS_DEF.h"
diff --git a/xAOD/xAODTruth/xAODTruth/TruthVertex.h b/xAOD/xAODTruth/xAODTruth/TruthVertex.h
index 560715f82fbba17ed80f1426d9bbc2c7466e94a6..6f24fbd975800bc3708c9256dccc1f32c931276e 100644
--- a/xAOD/xAODTruth/xAODTruth/TruthVertex.h
+++ b/xAOD/xAODTruth/xAODTruth/TruthVertex.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHVERTEX_H
 #define XAODTRUTH_TRUTHVERTEX_H
 
@@ -139,24 +138,5 @@ namespace xAOD {
    }; // class TruthVertex
 
 } // namespace xAOD
-=======
-// -*- C++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#ifndef XAODTRUTH_TRUTHVERTEX_H
-#define XAODTRUTH_TRUTHVERTEX_H
-
-#include "xAODTruth/versions/TruthVertex_v1.h"
-
-namespace xAOD {
-
-  /// Typedef to implementation
-  typedef TruthVertex_v1 TruthVertex;
-
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 #endif
diff --git a/xAOD/xAODTruth/xAODTruth/TruthVertexAuxContainer.h b/xAOD/xAODTruth/xAODTruth/TruthVertexAuxContainer.h
index 40ccb4033c04b5807ba7439e9dfb723e252d477b..b6098f4323eeee6a834f33495c00133a942571ea 100644
--- a/xAOD/xAODTruth/xAODTruth/TruthVertexAuxContainer.h
+++ b/xAOD/xAODTruth/xAODTruth/TruthVertexAuxContainer.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
 #define XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
 
@@ -43,25 +42,6 @@ namespace xAOD {
   }; // class TruthVertexAuxContainer
 
 } // namespace xAOD
-=======
-// Dear emacs, this is -*- c++ -*-
-
-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-// $Id: TruthVertexAuxContainer.h 622081 2014-10-16 00:55:18Z abuckley $
-#ifndef XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
-#define XAODTRUTH_TRUTHVERTEXAUXCONTAINER_H
-
-// Local include(s):
-#include "xAODTruth/versions/TruthVertexAuxContainer_v1.h"
-
-namespace xAOD {
-   /// Declare the latest version of the truth vertex auxiliary container
-   typedef TruthVertexAuxContainer_v1 TruthVertexAuxContainer;
-}
->>>>>>> fbfa9a4181233045f89cb94c800d3ea1cb76088a
 
 // Declare a CLID for the class
 #include "xAODCore/CLASS_DEF.h"