fix: solve conflict

Signed-off-by: N-Eiki <eiki.nagata.2@tier4.jp>

Author: N-Eiki

autoware_launch/launch/components/tier4_perception_component.launch.xml

@@ -16,25 +16,11 @@
   <arg name="lidar_detection_model" default="pointpainting" description="options: `centerpoint`, `apollo`, `pointpainting`, `clustering`"/>
   <arg name="traffic_light_recognition/fusion_only" default="true" description="Whether to start only some of the signal recognition related nodes"/>
 
-<<<<<<< HEAD
   <group if="$(eval sensor_model == 'aip_xx1_gen2')">
-    <!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
+  <!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
     This is because autoware.universe's launch files do not support an arbitrary number of cameras. If autoware.universe's launch files were to support it, it is recommended to use them instead. -->
     <include file="$(find-pkg-share autoware_launch)/launch/components/traffic_light_recognition/traffic_light.launch.xml"/>
   </group>
-=======
-  <!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
-  This is because autoware.universe's launch files do not support an arbitrary number of cameras. If autoware.universe's launch files were to support it, it is recommended to use them instead. -->
-  <include file="$(find-pkg-share autoware_launch)/launch/components/traffic_light_recognition/traffic_light.launch.xml"/>
-  <!-- NOTE: Override by false to disable conventional traffic light recognition launch -->
-  <let name="use_traffic_light_recognition" value="false"/>
-
-  <!-- <group if="$(eval sensor_model == 'aip_xx1_gen2')"> -->
-  <!-- In the Gen2 sensor configuration, the traffic_light_recognition node is launched not through the conventional autoware.universe/launch/tier4_perception_launch but with its own custom launch file.
-    This is because autoware.universe's launch files do not support an arbitrary number of cameras. If autoware.universe's launch files were to support it, it is recommended to use them instead. -->
-  <!-- <include file="$(find-pkg-share autoware_launch)/launch/components/traffic_light_recognition/traffic_light.launch.xml"/> -->
-  <!-- </group> -->
->>>>>>> b3da30656ccf0ef6d191712a40cfa98dbe937f98
   <!-- NOTE: Override by false to disable conventional traffic light recognition launch -->
   <let name="use_traffic_light_recognition" value="false" if="$(eval &quot;'aip_xx1_gen2' == '$(var sensor_model)'&quot;)"/>
   <let name="use_traffic_light_recognition" value="true" unless="$(eval &quot;'aip_xx1_gen2' == '$(var sensor_model)'&quot;)"/>