diff --git a/controller_manager/src/ros2_control_node.cpp b/controller_manager/src/ros2_control_node.cpp
index ce385e176b..aa444cde69 100644
--- a/controller_manager/src/ros2_control_node.cpp
+++ b/controller_manager/src/ros2_control_node.cpp
@@ -68,22 +68,16 @@ int main(int argc, char ** argv)
         {
           RCLCPP_INFO(
             cm->get_logger(), "Successful set up FIFO RT scheduling policy with priority %i.",
-            kSchedPriority);
+            thread_priority);
         }
       }
       else
       {
-<<<<<<< HEAD
         RCLCPP_WARN(
           cm->get_logger(),
           "No real-time kernel detected on this system. See "
           "[https://control.ros.org/master/doc/ros2_control/controller_manager/doc/userdoc.html] "
           "for details on how to enable realtime scheduling.");
-=======
-        RCLCPP_INFO(
-          cm->get_logger(), "Successful set up FIFO RT scheduling policy with priority %i.",
-          thread_priority);
->>>>>>> be0a339 (fix: typo use thread_priority (#1844))
       }
 
       // for calculating sleep time