resolves conflicts

Author: rashidsp

lib/optimizely.rb

@@ -336,6 +336,7 @@ def get_feature_variable_string(feature_flag_key, variable_key, user_id, attribu
         @logger.log(Logger::ERROR, InvalidDatafileError.new('get_feature_variable_string').message)
         return nil
       end
+
       variable_value = get_feature_variable_for_type(
         feature_flag_key,
         variable_key,
@@ -362,6 +363,7 @@ def get_feature_variable_boolean(feature_flag_key, variable_key, user_id, attrib
         @logger.log(Logger::ERROR, InvalidDatafileError.new('get_feature_variable_boolean').message)
         return nil
       end
+
       variable_value = get_feature_variable_for_type(
         feature_flag_key,
         variable_key,
@@ -388,6 +390,7 @@ def get_feature_variable_double(feature_flag_key, variable_key, user_id, attribu
         @logger.log(Logger::ERROR, InvalidDatafileError.new('get_feature_variable_double').message)
         return nil
       end
+
       variable_value = get_feature_variable_for_type(
         feature_flag_key,
         variable_key,