build: конфликт

main.cpp

@@ -11,6 +11,13 @@ int main()
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n';
+    if (a<b)
+    {
+        cout << "min = " << a << '\n';
+    }
+    else{
+        cout << "min = " << b << '\n';
+    }
     if (a>b)
     {
         cout << "max = " << a << '\n';