diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index ed524727a22a81b1d78b305d1295038167bde926..3f7a7ca4cf71d0d2aa7fd20a04cb6b647a6d55b2 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -2,7 +2,11 @@
    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
@@ -25,6 +29,7 @@
 #include <string>
 #include <bitset>
 #include <iomanip>
+<<<<<<< HEAD
 //#include <cmath>
 
 /// A base class which provides interface to L1Algo station geometry