diff --git a/main.cpp b/main.cpp
index 351ab18..e20101c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,10 +11,7 @@ int main()
          << "A - B = " << a - b << '\n'
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n'
-<<<<<<< HEAD
-         << max(a, b);
-=======
+         << max(a, b)
          << min(a, b);
->>>>>>> eac7fe3 (code: вывод минимума)
     return 0;
 }