build: конфликт

main.cpp

@@ -18,5 +18,12 @@ int main()
     else{
         cout << "min = " << b << '\n';
     }
+    if (a>b)
+    {
+        cout << "max = " << a << '\n';
+    }
+    else{
+        cout << "max = " << b << '\n';
+    }
     return 0;
 }