Fixed merge conflicts.

Author: alda-optimizely

OptimizelySDKCore/OptimizelySDKCore/Optimizely.m

@@ -326,10 +326,7 @@ - (BOOL)getVariableBool:(nonnull NSString *)variableKey
                  userId:(nonnull NSString *)userId
              attributes:(nullable NSDictionary *)attributes
                   error:(NSError * _Nullable * _Nullable)error {
-<<<<<<< HEAD
-=======
     BOOL variableValue = false;
->>>>>>> alda/userProfile
     NSString *variableValueStringOrNil = [self getVariableString:variableKey
                                              activateExperiments:activateExperiments
                                                           userId:userId

OptimizelySDKShared/OptimizelySDKShared/OPTLYDataStore.m

@@ -380,12 +380,7 @@ - (void)removeAllEvents:(OPTLYDataStoreEventType)eventType
     NSInteger numberOfEvents = [self numberOfEvents:eventType cachedData:cachedData error:error];
     [self removeFirstNEvents:numberOfEvents eventType:eventType cachedData:cachedData error:error];
 
-<<<<<<< HEAD
-    NSString *logMessage = [NSString stringWithFormat:OPTLYLoggerMessagesDataStoreEventsRemoveAllWarning];
-    [self.logger logMessage:logMessage withLevel:OptimizelyLogLevelWarning];
-=======
     [self.logger logMessage:OPTLYLoggerMessagesDataStoreEventsRemoveAllWarning withLevel:OptimizelyLogLevelWarning];
->>>>>>> alda/userProfile
 }