fix merge error

Author: roninopf

iterableapi/src/main/java/com/iterable/iterableapi/IterableApi.java

@@ -339,10 +339,6 @@ public void execute(@Nullable String data) {
         });
     }
 
-    public void setEmail(@Nullable String email) {
-        setEmail(email, null);
-    }
-
     /**
      * Set user email used for API calls
      * Calling this or {@link #setUserId(String)} is required before making any API calls.