fix merge conflicts

Signed-off-by: Xavier Dupre <xadupre@microsoft.com>

onnxmltools/convert/sparkml/utils.py

@@ -14,9 +14,9 @@ def buildInitialTypesSimple(dataframe):
 
 
 def getTensorTypeFromSpark(sparktype):
-    if sparktype == "StringType" or sparktype == "StringType()":
-        return StringTensorType([1, 1])
-    elif (
+    if sparktype in ("StringType", "StringType()"):
+        return StringTensorType([None, 1])
+    if (
         sparktype == "DecimalType"
         or sparktype == "DecimalType()"
         or sparktype == "DoubleType"
@@ -34,17 +34,16 @@ def getTensorTypeFromSpark(sparktype):
         or sparktype == "BooleanType"
         or sparktype == "BooleanType()"
     ):
-        return FloatTensorType([1, 1])
-    else:
-        raise TypeError("Cannot map this type to Onnx types: " + sparktype)
+        return FloatTensorType([None, 1])
+    raise TypeError("Cannot map this type to Onnx types: " + sparktype)
 
 
 def buildInputDictSimple(dataframe):
     import numpy
 
     result = {}
     for field in dataframe.schema.fields:
-        if str(field.dataType) == 'StringType' or str(field.dataType) == 'StringType()':
+        if str(field.dataType) in ("StringType", "StringType()"):
             result[field.name] = dataframe.select(field.name).toPandas().values
         else:
             result[field.name] = (