fix conflicts

Author: jaeopt

OptimizelySDK/Implementation/DefaultDatafileHandler.swift

@@ -107,7 +107,7 @@ class DefaultDatafileHandler : OPTDatafileHandler {
                 } else if let response = response as? HTTPURLResponse {
                     if response.statusCode == 200 {
                         let data = self.getResponseData(sdkKey: sdkKey, response: response, url: url)
-                        result = Result.success(data)
+                        result = .success(data)
                     }
                     else if response.statusCode == 304 {
                         self.logger?.log(level: .debug, message: "The datafile was not modified and won't be downloaded again")

OptimizelySDK/Optimizely/OptimizelyManager.swift

@@ -87,7 +87,7 @@ open class OptimizelyManager: NSObject {
                               decisionService: DefaultDecisionService(userProfileService: userProfileService),
                               notificationCenter: DefaultNotificationCenter())
 
-        logger.i("SDK Version: \(Utils.getSDKVersion())")
+        logger.i("SDK Version: \(Utils.sdkVersion)")
     }
 
     /// Start Optimizely SDK (Asynchronous)

OptimizelySDK/Utils/Utils.swift

@@ -22,7 +22,7 @@ class Utils {
     // - Bundle(identifier: bundleIdentifier) works ok consistently
     // - CocoaPods uses its own bundle identifier, so let it use Bundle(for:) as a fallback
     //   CocoaPods copies "s.version" in podspec to "CFBundleShortVersionString" in its own Info.plist file
-    static var sdkVersion:String = {
+    static var sdkVersion: String = {
         let bundle = Bundle(identifier: "com.optimizely.OptimizelySwiftSDK") ?? Bundle(for: OptimizelyManager.self)
         guard let version = bundle.infoDictionary!["CFBundleShortVersionString"] as? String else {
             return "1.0.0"