diff --git a/templates/calculator.html b/templates/calculator.html
index eb32056..018c2a7 100644
--- a/templates/calculator.html
+++ b/templates/calculator.html
@@ -19,7 +19,7 @@ Calculator
function solve() {
const num1 = parseFloat(document.getElementById('num1').value);
const num2 = parseFloat(document.getElementById('num2').value);
- const result = num1 * num2;
+ const result = num1 + num2;
document.getElementById('result').textContent = 'Result: ' + result;
}
diff --git a/templates/index.html b/templates/index.html
index 3554d5e..c4ce90c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,11 @@
Welcome
- Welcome to COMP3900
+<<<<<<< HEAD
+ Welcome to COMP3900/COMP9900
+=======
+ Welcome to COMP1111
+>>>>>>> origin/incorrect_branch_name