diff --git a/main.cpp b/main.cpp
index 2a109a0..9ede62f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,19 +8,13 @@ cout << "Enter A and B: ";
 double a, b, min, max;
 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';
 if (a > b)
 		a = max;
-		b = min;
 cout << max;
 
-=======
-     << "A - B = " << a - b << '\n';
-     << "A * B = " << a * b << '\n'
-     << "A / B = " << a * b << '\n'
->>>>>>> f39ce63ab4bbe38fc28b8b5c64a4aff3c2eff450
-    return 0;
+
+return 0;
 }