From 25c89008f0965a64d7c1f9550d5d57ca364d7e76 Mon Sep 17 00:00:00 2001
From: MMI122 <mubinislam05@gmail.com>
Date: Thu, 21 Aug 2025 18:56:32 +0600
Subject: [PATCH 1/5] added getter, setter here

---
 student.java | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 student.java

diff --git a/student.java b/student.java
new file mode 100644
index 00000000..bc735e7a
--- /dev/null
+++ b/student.java
@@ -0,0 +1,21 @@
+public class student {
+    private String name;
+    private int age;
+    public Student(String name, int age) {
+        this.name = name;
+        this.age = age;
+    }
+    public String getName() { 
+        return name; 
+        }
+    public int getAge() { 
+        return age; 
+        }
+
+    public void setName(String name) { 
+        this.name = name; 
+        }
+    public void setAge(int age) {
+         this.age = age; 
+         }
+}

From febff64a65281573bc183a88bdb6d9dec5d3f0d8 Mon Sep 17 00:00:00 2001
From: MMI122 <mubinislam05@gmail.com>
Date: Thu, 21 Aug 2025 19:13:59 +0600
Subject: [PATCH 2/5] added calculator

---
 Calculator.java | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Calculator.java

diff --git a/Calculator.java b/Calculator.java
new file mode 100644
index 00000000..6c0907ac
--- /dev/null
+++ b/Calculator.java
@@ -0,0 +1,9 @@
+public class Calculator {
+    public int add(int a, int b) { return a + b; }
+    public int subtract(int a, int b) { return a - b; }
+    public int multiply(int a, int b) { return a * b; }
+    public int divide(int a, int b) {
+        if (b == 0) throw new ArithmeticException("Invalid operation");
+        return a / b;
+    }
+}

From e2af998d8f2c3850e4ecd388a66d11c782be4f50 Mon Sep 17 00:00:00 2001
From: MMI122 <mubinislam05@gmail.com>
Date: Thu, 21 Aug 2025 19:28:49 +0600
Subject: [PATCH 3/5] for conflicting

---
 Calculator.java | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 Calculator.java

diff --git a/Calculator.java b/Calculator.java
new file mode 100644
index 00000000..217b5353
--- /dev/null
+++ b/Calculator.java
@@ -0,0 +1,10 @@
+public class Calculator {
+    public int add(int a, int b) { return a + b; }
+    public int subtract(int a, int b) { return a - b; }
+    public int multiply(int a, int b) { return a * b; }
+    public int divide(int a, int b) {
+        if (b == 0 && a!=0) throw new ArithmeticException("Invalid operation we have done here");
+        
+        return a / b;
+    }
+}

From 90a5bb156f20d7b0f1d7b5646a0503adb66a6b7b Mon Sep 17 00:00:00 2001
From: MMI122 <mubinislam05@gmail.com>
Date: Thu, 21 Aug 2025 19:30:30 +0600
Subject: [PATCH 4/5] here another for conflicting

---
 Calculator.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Calculator.java b/Calculator.java
index 6c0907ac..74eae4d2 100644
--- a/Calculator.java
+++ b/Calculator.java
@@ -3,7 +3,9 @@ public class Calculator {
     public int subtract(int a, int b) { return a - b; }
     public int multiply(int a, int b) { return a * b; }
     public int divide(int a, int b) {
-        if (b == 0) throw new ArithmeticException("Invalid operation");
+        if (b == 0) 
+        // we added something
+        throw new ArithmeticException("Invalid operation");
         return a / b;
     }
 }

From 0eee2c414ebe5ed4d63694245ad71ecb8d898b47 Mon Sep 17 00:00:00 2001
From: Md Mubin Islam Alif <123019706+MMI122@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:52:59 +0600
Subject: [PATCH 5/5] Create j.java

---
 j.java | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 j.java

diff --git a/j.java b/j.java
new file mode 100644
index 00000000..7aa833d2
--- /dev/null
+++ b/j.java
@@ -0,0 +1 @@
+#wer