Fix botched merge

tests/test_convert_to_json_serializable.py

@@ -1,3 +1,4 @@
+import datetime
 import re
 
 import numpy as np

tests/test_ge_utils.py

@@ -557,22 +557,3 @@ def test_convert_ndarray_float_to_datetime_tuple(
 def test_hyphen():
     txt: str = "validation_result"
     assert hyphen(txt=txt) == "validation-result"
-<<<<<<< HEAD
-
-
-@pytest.mark.unit
-@pytest.mark.parametrize(
-    "data", [pytest.param({"t": datetime.time(hour=1, minute=30, second=45)}, id="datetime.time")]
-)
-def test_convert_to_json_serializable_converts_correctly(data: dict):
-    ret = convert_to_json_serializable(data)
-    assert ret == {"t": "01:30:45"}
-
-
-@pytest.mark.unit
-@pytest.mark.parametrize(
-    "data", [pytest.param({"t": datetime.time(hour=1, minute=30, second=45)}, id="datetime.time")]
-)
-def test_ensure_json_serializable(data: dict):
-    ensure_json_serializable(data)
-    # Passes if no exception raised