generation bug fix

detox/src/android/espressoapi/web/WebViewElement.js

@@ -8,7 +8,7 @@
 
 class WebViewElement {
   static element(element, matcher, index) {
-    function element1(matcher) {
+    function element2(element, matcher) {
       return {
         target: element,
         method: "element",
@@ -19,7 +19,7 @@ class WebViewElement {
       };
     }
 
-    function element2(matcher, index) {
+    function element3(element, matcher, index) {
       if (typeof index !== "number") throw new Error("index should be a number, but got " + (index + (" (" + (typeof index + ")"))));
       return {
         target: element,
@@ -34,13 +34,13 @@ class WebViewElement {
       };
     }
 
-    if (arguments.length === 1) {
-      return element1.apply(null, arguments);
-    }
-
     if (arguments.length === 2) {
       return element2.apply(null, arguments);
     }
+
+    if (arguments.length === 3) {
+      return element3.apply(null, arguments);
+    }
   }
 
 }

generation/index.js

@@ -26,7 +26,6 @@ function createAndroidFiles() {
         }, {}
       );
 
-<<<<<<< HEAD
   const downloadedAndroidFilesMap =
     Object
       .entries(externalFilesToDownload)