diff --git a/main.cpp b/main.cpp
index 47b917d..2e7fc66 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,12 +12,21 @@ int main(){
   cout<< "Second number: ";
   cin>> second;
 
+<<<<<<< HEAD
+  std::cout<< "Addition: "<< first << "+" << second << "=";
+  std::cout<< (first+second) << std::endl;
+  std::cout<< "Subtraction: "<< first << "-" << second << "=";
+  std::cout<< (first-second) << std::endl;
+  std::cout<< "Multiplecation: "<< first << "*" << second << "=";
+  std::cout<< (first*second) << std::endl;
+=======
   cout<< "Addition: "<< first << "+" << second << "=";
   cout<< (first+second) << endl;
   cout<< "Subtraction: "<< first << "-" << second << "=";
   cout<< (first-second) << endl;
   cout<< "Multiplication: "<< first << "*" << second << "=";
   cout<< (first*second) << endl;
+>>>>>>> 14936c0a26d39b8368f0edd5a9f994a8c75474e4
 
   return 0;
 }
\ No newline at end of file