diff --git a/main.cpp b/main.cpp
index 1eae93d..a473a72 100644
--- a/main.cpp
+++ b/main.cpp
@@ -11,17 +11,14 @@ int main()
     << "A - B = " << a - b << '\n'
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n';
-<<<<<<< HEAD
     if (a < b)
         cout << "max = " << b;
     else
         cout << "max = " << a;
 
-=======
     if (a > b)
         cout << "min = " << b;
     else
         cout << "min = " << a;
->>>>>>> 9fbafa2 (code: added min)
     return 0;
 }