main.cpp

@@ -1,22 +1,17 @@
 #include <iostream>
 using namespace std;
 
-int main()
-{
+int main() {
     cout << "Enter A and B: ";
-    double a, b;
+    int a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
         << "A - B = " << a - b << '\n';
     cout << "A * B = " << a * b << '\n';
     cout << "A / B = " << a / b << '\n';
     cout << "MAX = " << (a > b ? a : b) << '\n';
-<<<<<<< HEAD
-    cout << "MIN = " << (a < b ? a : b) << '\n';
-=======
 
     cout << "MIN = " << (a < b ? a : b) << '\n';
 
->>>>>>> 4faa83512c724169d00e6679985e1927764bb2a6
     return 0;
 }