diff --git a/calculator.html b/calculator.html
index 839b37e4..fe2f7c36 100644
--- a/calculator.html
+++ b/calculator.html
@@ -5,13 +5,25 @@
 function square() {
   var num = document.getElementById("n1");
   num.value = num.value * num.value;
+
+function inverse() {
+  var num = document.getElementById("n1");
+  num.value = 1/num.value;
 }
 </script>
 </head>
 <body>
-  Number:
+<<<<<<< HEAD
+<h1>Nombre y apellidos del autor</h1>  
+Number:
   <input type="text" id="n1"><p>
 
   <button onclick="square()"> x<sup>2</sup> </button>
+=======
+  Number:
+  <input type="text" id="n1"><p>
+
+  <button onclick="inverse()"> 1/x </button>
+>>>>>>> inverse
 </body>
 </html>
