diff --git a/main.cpp b/main.cpp
index 8b558e7..3219ed4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,8 +12,13 @@ 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: Добавление печати минимума)
 }