From 2ea3bb29d70316e4c8a37843ad39b480511d0a1c Mon Sep 17 00:00:00 2001
From: euskov17 <st087349@student.spbu.ru>
Date: Mon, 29 Jan 2024 16:23:02 +0300
Subject: [PATCH] Resolve conflict

---
 library/cpp/monlib/counters/counters.h | 5 +----
 util/ysaveload_ut.cpp                  | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/library/cpp/monlib/counters/counters.h b/library/cpp/monlib/counters/counters.h
index 0ca0375720..d832412488 100644
--- a/library/cpp/monlib/counters/counters.h
+++ b/library/cpp/monlib/counters/counters.h
@@ -3,11 +3,8 @@
 #include <list>
 #include <util/datetime/base.h>
 #include <util/generic/algorithm.h>
-<<<<<<< HEAD
-#include <util/generic/map.h>
-=======
+
 #include <util/generic/list.h>
->>>>>>> f76958d9b3 (Replace TMap/TMultiMap to std::map/std::multimap)
 #include <util/generic/ptr.h>
 #include <util/generic/singleton.h>
 #include <util/generic/vector.h>
diff --git a/util/ysaveload_ut.cpp b/util/ysaveload_ut.cpp
index edd582fb64..f3cf4e0002 100644
--- a/util/ysaveload_ut.cpp
+++ b/util/ysaveload_ut.cpp
@@ -5,11 +5,8 @@
 #include <util/memory/pool.h>
 #include <util/stream/buffer.h>
 #include <util/memory/blob.h>
-<<<<<<< HEAD
-#include <util/generic/map.h>
-=======
+
 #include <util/generic/list.h>
->>>>>>> f76958d9b3 (Replace TMap/TMultiMap to std::map/std::multimap)
 #include <util/generic/hash_multi_map.h>
 #include <util/generic/deque.h>
 #include <util/generic/string.h>