diff --git a/main.cpp b/main.cpp
index 2229a2e..f787b42 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,7 @@ using namespace std;
 int main()
 {
 cout << "Enter A and B: ";
-<<<<<<< HEAD
-int  a, b;
-=======
 double a, b;
->>>>>>> double
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
      << "A - B = " << a - b << '\n'
@@ -20,13 +16,9 @@ cout << "A + B = " << a + b << '\n'
     else
         cout << b;
     if (a<b)
-<<<<<<< HEAD
+
         cout<<a;
     else cout<<b;
-=======
-        cout<< a;
-    else
-        cout<< b;
->>>>>>> double
+
 
 }