diff --git a/main.cpp b/main.cpp
index 21bbd8c..d5cc303 100644
--- a/main.cpp
+++ b/main.cpp
@@ -18,7 +18,11 @@ int main()
 
          << "A / B = " << a / b << '\n'
 
+<<<<<<< HEAD
          << "max(a, b) = " << max(a, b) << '\n';
+=======
+         << "min(a, b) = " << min(a, b) << '\n';
+>>>>>>> 3e3f5b3 (code: печать минимума из a и b)
 
 
     return 0;