diff --git a/project.cpp b/project.cpp
index e78b088..fcce6e0 100644
--- a/project.cpp
+++ b/project.cpp
@@ -12,19 +12,16 @@ int main()
          << "A * B = " << a * b << '\n'
          << "A / B = " << a / b << '\n';
     if (a > b) {
-<<<<<<< HEAD
         cout << a;
     }
     else {
         cout << b;
     }
-=======
+    if(b < a)
         cout << b;
     }
     else {
         cout << a;
     }
 
->>>>>>> 3a9e836 (code: Вывод минимума)
-
 }