diff --git a/main.cpp b/main.cpp
index 7fe6952..ae79385 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,18 +11,17 @@ int main()
         << "A - B = " << a - b << '\n'
         << "A * B = " << a * b << '\n'
         << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
         if ( a > b ) {
             cout << "maximum: " << a;
         }
         else {
             cout << "maximum: " << b;
-=======
+        }
         if ( a < b ) {
             cout << "minimum: " << a;
         }
         else {
             cout << "minimum: " << b;
->>>>>>> ec0eaf5 (code: вывод минимального числа)
         }
+        return 0;
 }