diff --git a/calculator.py b/calculator.py
index 607c2c2..061b7be 100644
--- a/calculator.py
+++ b/calculator.py
@@ -2,8 +2,23 @@ class Calculator:
     def add(self, x, y):
         return x + y
 
+<<<<<<< HEAD
+    def subtract(self, x, y):
+        return x - y
+=======
+    def multiply(self, x, y):
+        return x * y
+>>>>>>> 11dffa2 (feat: add multiplication)
+
 if __name__ == "__main__":
     calc = Calculator()
     print("Welcome to Calculator!")
-    print("Current feature: Addition")
-    print("Example: 5 + 3 =", calc.add(5, 3))
\ No newline at end of file
+<<<<<<< HEAD
+    print("Current features: Addition, Subtraction")
+    print("Example: 5 + 3 =", calc.add(5, 3))
+    print("Example: 5 - 3 =", calc.subtract(5, 3))
+=======
+    print("Current features: Addition, Multiplication")
+    print("Example: 5 + 3 =", calc.add(5, 3))
+    print("Example: 5 * 3 =", calc.multiply(5, 3))
+>>>>>>> 11dffa2 (feat: add multiplication)