diff --git a/main.cpp b/main.cpp
index 95f075d..0303cca 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,12 +9,8 @@ cout << "Enter A and B: ";
 int a, b;
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
-<<<<<<< HEAD
+
 << "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';
->>>>>>> 49938fe428eb2375b173e4fbc39789fee4673c98
-}
+<< "A / B = " << a / b << '\n'
+<<"max = "<<(a > b) ? a : b<<'\n';