diff --git a/main.cpp b/main.cpp
index af5f41a..4a92b61 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,19 +1,14 @@
 #include <iostream>
-
 using namespace std;
 
-int main()
-{
+int main() {
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
-    << "A - B = " << a - b << '\n'
-<<<<<<< HEAD
-    << "A * B = " << a * b << '\n'
-    << "A / B = " << a / b << '\n';
-=======
-    << "A * B = " << a * b << '\n';
->>>>>>> 39405101af664ce18327d0a764a1e4514b628162
-
+        << "A - B = " << a - b << '\n';
+    cout << "A * B = " << a * b << '\n';
+    cout << "A / B = " << a / b << '\n';
+    cout << "MAX = " << (a > b ? a : b) << '\n';
+    return 0;
 }