Fix conflicts

tests/test_optimizely.py

@@ -2398,7 +2398,7 @@ def test_get_feature_variable_integer_for_feature_in_rollout(self):
     )
 
   def test_get_feature_variable_string_for_feature_in_rollout(self):
-    """ Test that get_feature_variable_string returns String value as expected \
+    """ Test that get_feature_variable_double returns Double value as expected \
     and broadcasts decision with proper parameters. """
 
     opt_obj = optimizely.Optimizely(json.dumps(self.config_dict_with_features))
@@ -2801,6 +2801,8 @@ def test_get_feature_variable__returns_default_value_if_no_variation(self):
       }
     )
 
+    mock_client_logger.info.reset_mock()
+
     # Non-typed
     with mock.patch('optimizely.decision_service.DecisionService.get_variation_for_feature',
                     return_value=decision_service.Decision(None, None,