diff --git a/reco/L1/utils/CbmCaIdealHitProducerDet.h b/reco/L1/utils/CbmCaIdealHitProducerDet.h
index 2e6631c4ad26bd2ab5111568c17c16526d697edd..cd40487f4f537fa22dd46feec1e57609fe18763b 100644
--- a/reco/L1/utils/CbmCaIdealHitProducerDet.h
+++ b/reco/L1/utils/CbmCaIdealHitProducerDet.h
@@ -36,7 +36,10 @@
 #include "CbmTrdPoint.h"
 #include "CbmTrdTrackingInterface.h"
 
+<<<<<<< HEAD
 #include "FairRootManager.h"
+=======
+>>>>>>> CA: Bugfix in ideal hit finder
 #include "FairTask.h"
 #include "Logger.h"