diff --git a/nav2_bringup/bringup/rviz/nav2_default_view.rviz b/nav2_bringup/bringup/rviz/nav2_default_view.rviz
index e2981ba20d3dc3453ebaa528b6fed000985d03c2..04e989eb1705d925478ea40f2c4660d570b80ae3 100644
--- a/nav2_bringup/bringup/rviz/nav2_default_view.rviz
+++ b/nav2_bringup/bringup/rviz/nav2_default_view.rviz
@@ -425,7 +425,6 @@ Visualization Manager:
           Value: true
       Enabled: true
       Name: Controller
-<<<<<<< HEAD
     - Class: rviz_common/Group
       Displays:
         - Class: rviz_default_plugins/Image