max correct

main.cpp

@@ -9,9 +9,8 @@ int a, b;
 cout << "A + B = " << a + b << '\n'
      << "A - B = " << a - b << '\n'
      << "A * B = " << a * b << '\n'
-     << "A / B = " << a / b << '\n'
-     << "Max ="<< min((a + b), (a - b), (a * b), (a / b));
->>>>>>> 917d7839b44e13940165081fa67d3e197689bb4d
-
+     << "A / B = " << a / b << '\n';
+     if (a > b) cout<< "max = "<< a << '\n';
+else cout<< "max = "<< b << '\n';
     return 0;
 }