diff --git a/main.cpp b/main.cpp
index d448948..54ae710 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,6 +11,10 @@ int main()
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n'
+<<<<<<< HEAD
         << max(a, b);
+=======
+        << min(a, b);
+>>>>>>> f4b6ef4 (code: вывод минимума)
     return 0;
 }