diff --git a/project.cpp b/project.cpp
index 8913bcc..e78b088 100644
--- a/project.cpp
+++ b/project.cpp
@@ -12,10 +12,19 @@ int main()
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
     if (a > b) {
+<<<<<<< HEAD
         cout << a;
     }
     else {
         cout << b;
     }
+=======
+        cout << b;
+    }
+    else {
+        cout << a;
+    }
+
+>>>>>>> 3a9e836 (code: Вывод минимума)
 
 }