Modified add method in feature/calculator differently to create a conflict

Author: TusharKumarRoy

Calculator.java

@@ -1,5 +1,5 @@
 public class Calculator {
-    public int add(int a, int b) { return a + b; }
+    public int add(int a, int b) { return a + b + 20; }   // different modification in feature/calculator to create conflict
     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) {