Resolved conflicts and updated main.cpp

main.cpp

@@ -11,7 +11,7 @@ int main()
          << "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';
 
 }