Merge branch 'embedded-messaging' into evan/MOB-7313-prepare-3.5.0-beta1-release

Author: mprew97

swift-sdk/Internal/InternalIterableAPI.swift

@@ -82,18 +82,16 @@ final class InternalIterableAPI: NSObject, PushTrackerProtocol, AuthProvider {
         self.dependencyContainer.createAuthManager(config: self.config)
     }()
 
-<<<<<<< HEAD
     lazy var embeddedManager: IterableEmbeddedManagerProtocol = {
         self.dependencyContainer.createEmbeddedManager(config: self.config,
                                                                 apiClient: self.apiClient)
     }()
-=======
+    
     var apiEndPointForTest: String {
         get {
             apiEndPoint
         }
     }
->>>>>>> master
 
     // MARK: - SDK Functions