fix branch conflict issue

Author: Mansi-mParticle

android-kit-base/src/main/java/com/mparticle/kits/KitManagerImpl.java

@@ -1342,16 +1342,18 @@ public void execute(String viewName,
         for (KitIntegration provider : providers.values()) {
             try {
                 if (provider instanceof KitIntegration.RoktListener && !provider.isDisabled()) {
+                    if (attributes == null) {
+                        attributes = new HashMap<>();
+                    }
                     MParticle instance = MParticle.getInstance();
                     MParticleUser user = instance.Identity().getCurrentUser();
-                    String email = attributes != null ? attributes.get("email") : null;
+                    String email = attributes.get("email");
+                    Map<String, String> finalAttributes = attributes;
                     confirmEmail(email,user,instance.Identity(), () -> {
                     JSONArray jsonArray = new JSONArray();
 
                     KitConfiguration kitConfig = provider.getConfiguration();
-                    if (attributes == null) {
-                        attributes = new HashMap<>();
-                    }
+
                     if (kitConfig != null) {
                         try {
                             jsonArray = kitConfig.getPlacementAttributesMapping();
@@ -1364,27 +1366,27 @@ public void execute(String viewName,
                         if (obj == null) continue;
                         String mapFrom = obj.optString("map");
                         String mapTo = obj.optString("value");
-                        if (attributes.containsKey(mapFrom)) {
-                            String value = attributes.remove(mapFrom);
-                            attributes.put(mapTo, value);
+                        if (finalAttributes.containsKey(mapFrom)) {
+                            String value = finalAttributes.remove(mapFrom);
+                            finalAttributes.put(mapTo, value);
                         }
                     }
                     Map<String, Object> objectAttributes = new HashMap<>();
-                    for (Map.Entry<String, String> entry : attributes.entrySet()) {
-                        if(!attributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
+                    for (Map.Entry<String, String> entry : finalAttributes.entrySet()) {
+                        if(!finalAttributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
                             objectAttributes.put(entry.getKey(), entry.getValue());
                         }
                     }
                     if (user != null) {
                         user.setUserAttributes(objectAttributes);
                     }
 
-                    if (!attributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
-                        attributes.put(Constants.MessageKey.SANDBOX_MODE_ROKT, String.valueOf(Objects.toString(MPUtility.isDevEnv(), "false")));  // Default value is "false" if null
+                    if (!finalAttributes.containsKey(Constants.MessageKey.SANDBOX_MODE_ROKT)) {
+                        finalAttributes.put(Constants.MessageKey.SANDBOX_MODE_ROKT, String.valueOf(Objects.toString(MPUtility.isDevEnv(), "false")));  // Default value is "false" if null
                     }
 
                     ((KitIntegration.RoktListener) provider).execute(viewName,
-                            attributes,
+                            finalAttributes,
                             mpRoktEventCallback,
                             placeHolders,
                             fontTypefaces,

android-kit-base/src/test/kotlin/com/mparticle/kits/KitManagerImplTest.kt

@@ -36,7 +36,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mockito
 import org.mockito.ArgumentMatchers.any
-import org.mockito.Mockito
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.verify
 import org.mockito.Mockito.`when`