Resolved conflicts and updated main.cpp

main.cpp

@@ -4,14 +4,14 @@ using namespace std;
 
 int main()
 {
- cout << "Enter A and B: ";
+    cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
-     cout << "A + B = " << a + b << '\n'
+    cout << "A + B = " << a + b << '\n'
-    << "A - B = " << a - b << '\n'
+         << "A - B = " << a - b << '\n'
-     << "A * B = " << a * b << '\n'
+         << "A * B = " << a * b << '\n'
-      << "A / B = " << a / b << '\n'
+         << "A / B = " << a / b << '\n'
-<< "Max(A, B) = " << max(a, b) << '\n'
+         << "Max(A, B) = " << max(a, b) << '\n'
-  << "Min(A, B) = " << min(a, b) << '\n';
+         << "Min(A, B) = " << min(a, b) << '\n';
 
 }