diff --git a/src/main/kotlin/com/mparticle/kits/AppboyKit.kt b/src/main/kotlin/com/mparticle/kits/AppboyKit.kt
index 5816b7b..62a76d6 100644
--- a/src/main/kotlin/com/mparticle/kits/AppboyKit.kt
+++ b/src/main/kotlin/com/mparticle/kits/AppboyKit.kt
@@ -1076,6 +1076,11 @@ open class AppboyKit : KitIntegration(), AttributeListener, CommerceListener,
         const val HOST = "host"
         const val PUSH_ENABLED = "push_enabled"
         const val NAME = "Appboy"
+<<<<<<< Updated upstream
+=======
+        // if this flag is true, kit will send Product name as sku
+        const val REPLACE_SKU_AS_PRODUCT_NAME = "replaceSkuWithProductName"
+>>>>>>> Stashed changes
         private const val PREF_KEY_HAS_SYNCED_ATTRIBUTES = "appboy::has_synced_attributes"
         private const val PREF_KEY_CURRENT_EMAIL = "appboy::current_email"
         private const val FLUSH_DELAY = 5000
diff --git a/src/test/kotlin/com/mparticle/kits/mocks/MockKitManagerImpl.kt b/src/test/kotlin/com/mparticle/kits/mocks/MockKitManagerImpl.kt
index 7aa1d98..3bddfd8 100644
--- a/src/test/kotlin/com/mparticle/kits/mocks/MockKitManagerImpl.kt
+++ b/src/test/kotlin/com/mparticle/kits/mocks/MockKitManagerImpl.kt
@@ -30,7 +30,7 @@ class MockKitManagerImpl(
             CoreCallbacks::class.java
         )
     ) {
-        Mockito.`when`(mCoreCallbacks.kitListener).thenReturn(KitListener.EMPTY)
+        Mockito.`when`(mCoreCallbacks.getKitListener()).thenReturn(KitListener.EMPTY)
     }
 
     @Throws(JSONException::class)