diff --git a/main.cpp b/main.cpp
index 3219ed4..8b558e7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,13 +12,8 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
 
     cout << max(a, b);
     cout << min(a, b);
 
-=======
-    cout << max(a, b);
-    cout << min(a, b);
->>>>>>> df5cc75 (code: Добавление печати минимума)
 }