Resolved merge conflicts

main.cpp

@@ -9,5 +9,7 @@ int main()
     cin >> a >> b;
      cout << "A + B = " << a + b << '\n'
     << "A - B = " << a - b << '\n'
+    << "A * B = " << a * b << '\n'
+
 
 }