main.cpp

@@ -1,7 +1,6 @@
 #include <iostream>
 
 using namespace std;
-// you may type whatever you want
 
 int main()
 {
@@ -9,12 +8,6 @@ cout << "Enter A and B: ";
 int a, b;
 cin >> a >> b;
 cout << "A + B = " << a + b << '\n'
-<<<<<<< HEAD
-<< "A - B = " << a - b << '\n'
-<< "A * B = " << a * b << '\n'
-<< "A / B = " << a / b << '\n';
-=======
 << "A - B = " << a - b << '\n';
 << "A * B = " << a * b << '\n';
->>>>>>> 49938fe428eb2375b173e4fbc39789fee4673c98
 }