Fix merge conflicts

Signed-off-by: Barry Xu <barry.xu@sony.com>

Author: Barry-Xu-2018

rclcpp/include/rclcpp/subscription.hpp

@@ -295,22 +295,16 @@ class Subscription : public SubscriptionBase
     void * loaned_message,
     const rclcpp::MessageInfo & message_info) override
   {
-<<<<<<< HEAD
-    auto typed_message = static_cast<CallbackMessageT *>(loaned_message);
-    // message is loaned, so we have to make sure that the deleter does not deallocate the message
-    auto sptr = std::shared_ptr<CallbackMessageT>(
-      typed_message, [](CallbackMessageT * msg) {(void) msg;});
-=======
     if (matches_any_intra_process_publishers(&message_info.get_rmw_message_info().publisher_gid)) {
       // In this case, the message will be delivered via intra process and
       // we should ignore this copy of the message.
       return;
     }
 
-    auto typed_message = static_cast<ROSMessageType *>(loaned_message);
+    auto typed_message = static_cast<CallbackMessageT *>(loaned_message);
     // message is loaned, so we have to make sure that the deleter does not deallocate the message
-    auto sptr = std::shared_ptr<ROSMessageType>(
-      typed_message, [](ROSMessageType * msg) {(void) msg;});
+    auto sptr = std::shared_ptr<CallbackMessageT>(
+      typed_message, [](CallbackMessageT * msg) {(void) msg;});
 
     std::chrono::time_point<std::chrono::system_clock> now;
     if (subscription_topic_statistics_) {
@@ -319,7 +313,6 @@ class Subscription : public SubscriptionBase
       now = std::chrono::system_clock::now();
     }
 
->>>>>>> 5c688303 (Add statistics for handle_loaned_message (#1927))
     any_callback_.dispatch(sptr, message_info);
 
     if (subscription_topic_statistics_) {