diff --git a/main.cpp b/main.cpp
index 83f2b52..55db762 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,7 +9,16 @@ int main()
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
+<<<<<<< HEAD
         << "A * b == " << a * b << '\n';
 
 
+=======
+        << "A * B = " << a * b << '\n';
+    if(a>b){
+        cout << "MAX: " << a << '\n';
+    }else{
+    cout << "MAX: " << b << '\n;';
+    }
+>>>>>>> 64d26ed (code: добавлен вывод максимума)
 }