main.cpp

@@ -9,11 +9,6 @@ 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
 
 }