Address merge conflicts

Signed-off-by: Michael Orlov <[email protected]>

rosbag2_cpp/src/rosbag2_cpp/converter.cpp

@@ -75,26 +75,15 @@ std::shared_ptr<rosbag2_storage::SerializedBagMessage> Converter::convert(
   // deserialize
   rosbag2_cpp::introspection_message_set_topic_name(
     allocated_ros_message.get(), message->topic_name.c_str());
-<<<<<<< HEAD
   allocated_ros_message->time_stamp = message->time_stamp;
-  input_converter_->deserialize(message, introspection_ts, allocated_ros_message);
-=======
-  allocated_ros_message->time_stamp = message->recv_timestamp;
   input_converter_->deserialize(message, rmw_ts, allocated_ros_message);
->>>>>>> 6e82f52f (Bugfix for rosbag2_cpp serialization converter (#1814))
 
   // re-serialize with the new serializer
   auto output_message = std::make_shared<rosbag2_storage::SerializedBagMessage>();
   output_message->serialized_data = rosbag2_storage::make_empty_serialized_message(0);
   output_message->topic_name = std::string(allocated_ros_message->topic_name);
-<<<<<<< HEAD
   output_message->time_stamp = allocated_ros_message->time_stamp;
-  output_converter_->serialize(allocated_ros_message, introspection_ts, output_message);
-=======
-  output_message->recv_timestamp = message->recv_timestamp;
-  output_message->send_timestamp = message->send_timestamp;
   output_converter_->serialize(allocated_ros_message, rmw_ts, output_message);
->>>>>>> 6e82f52f (Bugfix for rosbag2_cpp serialization converter (#1814))
   return output_message;
 }