main.cpp

@@ -9,13 +9,8 @@ int a, b;
 cin >> a >> b;
 cout << "A + B .=.. " << a + b << '\n'
      << "A - B = " << a - b << '\n'
-<<<<<<< HEAD
-     << "A * Bb =" << a * b;'\n'
-=======
      << "A * B =.." << a * b <<'\n'
-     << "Aà % Bb =.." << a % b;'\n'
-     << "Bb * b =.."<< a **b;
->>>>>>> 917d7839b44e13940165081fa67d3e197689bb4d
+     << "Aà % Bb =.." << a % b;
 
     return 0;
 }