diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index 8407c5ad8f1cbf9b7ceecd2bffb72badf1fecc4d..f9231104752ec60020c74f93c7bb7f96cc4dcdd3 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -2,11 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Sergey Gorbunov, Sergei Zharko [committer] */
 
-<<<<<<< HEAD
-/************************************************************************************************************
-=======
 /**************************************************************************************************************
->>>>>>> Added new class L1BaseStationInfo to the L1Algo core
  * @file L1BaseStationInfo.h
  * @bried A base class for a L1 station interface
  * @since 18.12.2021