From 7a2e8d876dd7ec5a60b3d6d161da0ea6cfdeb7a4 Mon Sep 17 00:00:00 2001
From: itsmecharliev <45504444+itsmecharliev@users.noreply.github.com>
Date: Wed, 10 Sep 2025 11:44:59 -0700
Subject: [PATCH] Resolved merge conflict

Added displaying of operation
---
 main.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.cpp b/main.cpp
index a495fc9..f912fad 100644
--- a/main.cpp
+++ b/main.cpp
@@ -9,13 +9,13 @@ int main()
     int x,y;
 
     std::cin >> x >> y;
-    std::cout << "Addition: " << x + y << std::endl;
-    std::cout << "Subtraction: " << x - y << std::endl;
-    std::cout << "Multiplication: " << x * y << std::endl;
-    std::cout << "Division: " << x / y << std::endl;
-    std::cout << "Remainder: " << x % y << std::endl;
-    std::cout << "Square Root: " << sqrt(x) << std::endl;
-    std::cout << "Square: " << pow(x, y) << std::endl;
+    std::cout << x << "+" << y << "="<< x + y << std::endl;
+    std::cout << x << "-" << y << "="<< x - y << std::endl;
+    std::cout << x << "*" << y << "="<< x * y << std::endl;
+    std::cout << x << "/" << y << "="<< x / y << " with a remainder of " << x%y << std::endl;
+    std::cout << "Square Root of " << x << " is " << sqrt(x) << std::endl;
+    std::cout << "Square Root of " << y << " is " << sqrt(y) << std::endl;
+    std::cout << x << "^" << y << "=" << pow(x, y) << std::endl;
 
     return 0;
 }