fix some conflict

Author: eedalong

client/Session.cs

@@ -374,7 +374,7 @@ public TSInsertRecordsReq gen_insert_records_req(List<string> device_id, List<Li
                         var err_msg = String.Format("deviceIds, times, measurementsList and valueList's size should be equal");
                         throw new TException(err_msg, null);
                     }
-                    var values_in_bytes = value_to_bytes(data_types, values);
+                    var values_in_bytes = util_functions.value_to_bytes(data_types, values);
                     values_lst_in_bytes[i] = values_in_bytes;
                 });
             }
@@ -564,7 +564,7 @@ public TSInsertRecordsOfOneDeviceReq gen_insert_records_of_one_device_request(st
                         var err_msg = "insert records of one device error: deviceIds, times, measurementsList and valuesList's size should be equal";
                         throw new TException(err_msg, null);
                     }
-                    var value_in_bytes = value_to_bytes(data_type_values, values_lst[i]);
+                    var value_in_bytes = util_functions.value_to_bytes(data_type_values, values_lst[i]);
                     binary_value_lst[i] = value_in_bytes;
                 });
             }
@@ -575,7 +575,7 @@ public TSInsertRecordsOfOneDeviceReq gen_insert_records_of_one_device_request(st
                         var err_msg = "insert records of one device error: deviceIds, times, measurementsList and valuesList's size should be equal";
                         throw new TException(err_msg, null);
                     }
-                    var value_in_bytes = util_functions.util_functionsvalue_to_bytes(data_type_values, values_lst[i]);
+                    var value_in_bytes = util_functions.value_to_bytes(data_type_values, values_lst[i]);
                     binary_value_lst[i] = value_in_bytes;
                 }
             }

client/Test.cs

@@ -8,6 +8,8 @@ static void Main(){
             // Unit Test
             UnitTest unit_test = new UnitTest();
             unit_test.Test();
+
+            // session test
             SessionTest session_test = new SessionTest();
             session_test.Test();