diff --git a/main.cpp b/main.cpp
index 5173300..2f712df 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,7 +10,11 @@ int main()
     cout << "A + B = " << a + b << '\n'
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
+<<<<<<< HEAD
          << "A / B = " << a / b << '\n'
          << "Min: " << min(a, b) << '\n'
          << "Max: " << max(a, b) << '\n';
+=======
+         << "A / B = " << a / b << '\n';
+>>>>>>> parent of 8245a33 (code: вывод минимума)
 }