diff --git a/main.cpp b/main.cpp
index 9a4302e..ef3348c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,19 +7,16 @@ int main()
     cout << "Enter A and B: ";
     int a, b;
     cin >> a >> b;
-<<<<<<< HEAD
     int maxx;
     if (a>b){
         maxx=a;
     }else{
         maxx=b;
-=======
     int mini;
     if (a<b){
         mini=a;
     }else{
         mini=b;
->>>>>>> 4db7c31 (code:add min)
     }
 cout<< "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'