From f836d175170b68bd66d1422b48b821a528742fc7 Mon Sep 17 00:00:00 2001
From: InsertUzername <nhiakouxiong21@gmail.com>
Date: Mon, 31 Aug 2026 11:38:40 -0700
Subject: [PATCH 1/2] fix: divide by zero problem, close #61

---
 main.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/main.cpp b/main.cpp
index 5411e7a3..2434ca99 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,8 +16,14 @@ int main()
     cout << "Addition: " << x + y << endl;
     cout << "Subtraction: " << x - y << endl;
     cout << "Multiplication: " << x * y << endl;
-    cout << "Division: " << x / y << endl;
-    cout << "Remainder: " << x % y << endl;
+
+    if(y == 0) {
+        cout << "Dividing by zero is not a number." << endl;
+    }
+    else {
+        cout << "Division: " << x / y << endl;
+        cout << "Remainder: " << x % y << endl;
+    }
     cout << "Square Root: " << sqrt(x) << endl;
     cout << "Square: " << pow(x, y) << endl;
 

From 1b3c446df158f70d108ed06e983b3a7ebf2ad439 Mon Sep 17 00:00:00 2001
From: InsertUzername <nhiakouxiong21@gmail.com>
Date: Wed, 2 Sep 2026 11:40:51 -0700
Subject: [PATCH 2/2] Resolve conlfict with upstream main

---
 main.cpp | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/main.cpp b/main.cpp
index 94a30e2d..23d2a8ce 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,31 +8,21 @@ int main()
 
     int x,y;
 
-<<<<<<< HEAD
-    cin >> x >> y;
-    cout << "Addition: " << x + y << endl;
-    cout << "Subtraction: " << x - y << endl;
-    cout << "Multiplication: " << x * y << endl;
+    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;
 
     if(y == 0) {
-        cout << "Dividing by zero is not a number." << endl;
+        std::cout << "Dividing by zero is not a number." << std::endl;
     }
     else {
-        cout << "Division: " << x / y << endl;
-        cout << "Remainder: " << x % y << endl;
+        std::cout << "Division: " << x / y << std::endl;
+        std::cout << "Remainder: " << x % y << std::endl;
     }
-    cout << "Square Root: " << sqrt(x) << endl;
-    cout << "Square: " << pow(x, y) << endl;
-=======
-    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;
->>>>>>> main
 
     return 0;
 }