diff --git a/reverseString/reverseString.js b/reverseString/reverseString.js
index ae3d742..8f13538 100644
--- a/reverseString/reverseString.js
+++ b/reverseString/reverseString.js
@@ -1,4 +1,20 @@
+<<<<<<< HEAD
 const reverseString = function(sourceString) {
+=======
+const reverseString = function(inputString) {
+
+    let stringLength = inputString.length;
+    let revString = ''
+
+    for (let i = stringLength; i >= 0; i--) {
+        if (revString === 'undefined') {
+            revString = ''
+        }
+        revString = revString + inputString[i];
+    }
+
+    return revString;
+>>>>>>> master
 
     let revString = '';