diff --git a/main.cpp b/main.cpp
index f8c918a..0716dd5 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,11 +9,15 @@ 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 << a;}
     else{
         cout << b;}
+=======
+         << "A * B = " << a * b << '\n';
+>>>>>>> 58348bb (code: Добавлена печать минимума)
 }