diff --git a/common_sensor_launch/launch/spinnaker.launch.py b/common_sensor_launch/launch/spinnaker.launch.py
index ee047a36..3fafe623 100644
--- a/common_sensor_launch/launch/spinnaker.launch.py
+++ b/common_sensor_launch/launch/spinnaker.launch.py
@@ -67,13 +67,9 @@ def load_composable_node_param(param_path):
                         "camera_info_url"
                     ),
                 },
-<<<<<<< HEAD
                 {
                     "use_image_transport": LaunchConfiguration("use_image_transport")
                 }
-=======
-                {"use_image_tranport": LaunchConfiguration("use_image_tranport")},
->>>>>>> 38605787025d7a216b4e669674a0b8e21d58623b
             ],
             extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
         ),