diff --git a/main.cpp b/main.cpp
index 5d0cbb6..bee5303 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,13 +11,9 @@ int main()
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
-        << "A / B = " << a / b << '\n';
-
-<<<<<<< HEAD
-        min(a, b);
-=======
-    max(a, b);
->>>>>>> 5d15d1c (code: добавление максимума из чисел)
+        << "A / B = " << a / b << '\n'
+        << min(a, b)
+        << max(a, b);
 
     return 0;
 }