diff --git a/ur_robot_driver/CMakeLists.txt b/ur_robot_driver/CMakeLists.txt
index 1e1d6f33..99e17310 100644
--- a/ur_robot_driver/CMakeLists.txt
+++ b/ur_robot_driver/CMakeLists.txt
@@ -145,15 +145,12 @@ ament_python_install_package(${PROJECT_NAME})
 # Install executables
 install(PROGRAMS
   scripts/tool_communication.py
-<<<<<<< forward_controller
   ../examples/examples.py
   ../examples/load_switch_controller_example.py
   ../examples/example_movej.py
   ../examples/example_spline.py
-=======
   scripts/wait_for_robot_description
   scripts/start_ursim.sh
->>>>>>> main
   DESTINATION lib/${PROJECT_NAME}
 )
 
diff --git a/ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp b/ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
index 38f1300d..f07a90ad 100644
--- a/ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
+++ b/ur_robot_driver/include/ur_robot_driver/hardware_interface.hpp
@@ -244,11 +244,8 @@ class URPositionHardwareInterface : public hardware_interface::SystemInterface
 
   std::atomic_bool rtde_comm_has_been_started_ = false;
 
-<<<<<<< forward_controller
   const std::string PASSTHROUGH_TRAJECTORY_CONTROLLER = "passthrough_controller/passthrough_trajectory_positions_";
-=======
   urcl::RobotReceiveTimeout receive_timeout_ = urcl::RobotReceiveTimeout::millisec(20);
->>>>>>> main
 };
 }  // namespace ur_robot_driver