diff --git a/main.cpp b/main.cpp
index 9e05b69..2a109a0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,6 +8,7 @@ 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';
@@ -16,5 +17,10 @@ if (a > b)
 		b = min;
 cout << max;
 
+=======
+     << "A - B = " << a - b << '\n';
+     << "A * B = " << a * b << '\n'
+     << "A / B = " << a * b << '\n'
+>>>>>>> f39ce63ab4bbe38fc28b8b5c64a4aff3c2eff450
     return 0;
 }