diff --git a/calculator.html b/calculator.html
index 839b37e4..9c2c0cad 100644
--- a/calculator.html
+++ b/calculator.html
@@ -2,16 +2,30 @@
 <title>Calculator</title><meta charset="utf-8">
 <script type="text/javascript">
 
+<<<<<<< HEAD
+function inverse() {
+  var num = document.getElementById("n1");
+  num.value = 1/num.value;
+=======
 function square() {
   var num = document.getElementById("n1");
   num.value = num.value * num.value;
+>>>>>>> master
 }
 </script>
 </head>
 <body>
+<<<<<<< HEAD
+  Number:
+  <input type="text" id="n1"><p>
+
+  <button onclick="inverse()"> 1/x </button>
+=======
+  <h1>Alejandro Bravo Calderón</h1>
   Number:
   <input type="text" id="n1"><p>
 
   <button onclick="square()"> x<sup>2</sup> </button>
+>>>>>>> master
 </body>
 </html>
