diff --git a/main.cpp b/main.cpp
index d7f8b36..7fe6952 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,10 +11,18 @@ int main()
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n';
+<<<<<<< HEAD
         if ( a > b ) {
             cout << "maximum: " << a;
         }
         else {
             cout << "maximum: " << b;
+=======
+        if ( a < b ) {
+            cout << "minimum: " << a;
+        }
+        else {
+            cout << "minimum: " << b;
+>>>>>>> ec0eaf5 (code: вывод минимального числа)
         }
 }