diff --git a/main.cpp b/main.cpp
index 7894e81..af5f41a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,7 +9,11 @@ int main()
     cin >> a >> b;
     cout << "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'
+<<<<<<< HEAD
     << "A * B = " << a * b << '\n'
     << "A / B = " << a / b << '\n';
+=======
+    << "A * B = " << a * b << '\n';
+>>>>>>> 39405101af664ce18327d0a764a1e4514b628162
 
 }