diff --git a/main.cpp b/main.cpp
index 2776116..c9bbaa2 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,15 +6,10 @@ int main()
 {
     cout << "Enter A and B: ";
 int a, b;
-cin >> a >> b;
-cout << "A + B .=.. " << a + b << '\n'
+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;
+     << "A * B = " << a * b << '\n'
+     << "A / B = " << a / b << '\n';
 >>>>>>> 917d7839b44e13940165081fa67d3e197689bb4d
 
     return 0;