fix: Use Clock instead of deprecated ROSClock (#1273)

(cherry picked from commit 3703507)

# Conflicts:
#	rosbridge_library/src/rosbridge_library/internal/message_conversion.py

Author: bjsowa

rosbridge_library/src/rosbridge_library/internal/message_conversion.py

@@ -37,24 +37,28 @@
 import re
 from base64 import standard_b64decode, standard_b64encode
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 import numpy as np
 from builtin_interfaces.msg import Duration as DurationMsg
 from builtin_interfaces.msg import Time as TimeMsg
-from rclpy.clock import ROSClock
+from rclpy.clock import Clock
+from rclpy.clock_type import ClockType
 from std_msgs.msg import Header as HeaderMsg
 
 from rosbridge_library.internal import ros_loader
 from rosbridge_library.internal.type_support import ROSMessage
 from rosbridge_library.util import bson
 
+<<<<<<< HEAD
 if TYPE_CHECKING:
     from collections.abc import Callable
 
     from rclpy.clock import Clock
 
 
+=======
+>>>>>>> 3703507 (fix: Use Clock instead of deprecated ROSClock (#1273))
 type_map = {
     "bool": ("bool", "boolean"),
     "int": (
@@ -201,7 +205,7 @@ def populate_instance(
     according to the values in msg.
     """
     if clock is None:
-        clock = ROSClock()
+        clock = Clock(clock_type=ClockType.ROS_TIME)
 
     inst_type = msg_instance_type_repr(inst)
 
@@ -344,7 +348,7 @@ def _to_inst(
     stack: list[str] | None = None,
 ) -> object:
     if clock is None:
-        clock = ROSClock()
+        clock = Clock(clock_type=ClockType.ROS_TIME)
     if stack is None:
         stack = []