diff --git a/main.cpp b/main.cpp
index 3e44e23..ff1c982 100644
--- a/main.cpp
+++ b/main.cpp
@@ -10,5 +10,8 @@ int main()
     cout << "A + B = " << a + b << '\n';
     cout<< "A - B = " << a - b << '\n';
     cout<< "A * B = " << a * b << '\n';
+<<<<<<< HEAD
     cout<< "A / B = " << a / b << '\n';
+=======
+>>>>>>> 391e34f1bffbfd05c1ff4f4fd26786799f23a3bd
 }