Fix merge conflicts

3 files changed, 3 insertions, 9 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
index a945d7281f..a22fad1d3b 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/hmi_command_factory.cc
@@ -933,16 +933,14 @@ CommandCreator& HMICommandFactory::get_creator_factory(
     case hmi_apis::FunctionID::BasicCommunication_OnAppPropertiesChange: {
       return factory.GetCreator<commands::OnAppPropertiesChangeNotification>();
     }
-<<<<<<< HEAD
     case hmi_apis::FunctionID::UI_OnUpdateFile: {
       return factory.GetCreator<commands::OnUIUpdateFileNotification>();
     }
     case hmi_apis::FunctionID::UI_OnUpdateSubMenu: {
       return factory.GetCreator<commands::OnUIUpdateSubMenuNotification>();
-=======
+    }
     case hmi_apis::FunctionID::UI_OnSubtleAlertPressed: {
       return factory.GetCreator<commands::OnUISubtleAlertPressedNotification>();
->>>>>>> origin/develop
     }
     default: { return factory.GetCreator<InvalidCommand>(); }
   }
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
index 98b2fcb74f..a585f4cecf 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/mobile_command_factory.cc
@@ -469,16 +469,14 @@ CommandCreator& MobileCommandFactory::get_notification_creator(
     case mobile_apis::FunctionID::OnWayPointChangeID: {
       return factory.GetCreator<commands::OnWayPointChangeNotification>();
     }
-<<<<<<< HEAD
     case mobile_apis::FunctionID::OnUpdateFileID: {
       return factory.GetCreator<commands::OnUpdateFileNotification>();
     }
     case mobile_apis::FunctionID::OnUpdateSubMenuID: {
       return factory.GetCreator<commands::OnUpdateSubMenuNotification>();
-=======
+    }
     case mobile_apis::FunctionID::OnSubtleAlertPressedID: {
       return factory.GetCreator<commands::OnSubtleAlertPressedNotification>();
->>>>>>> origin/develop
     }
     default: {}
   }
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index 753eacf811..a12036ef0e 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -732,13 +732,11 @@
   <element name="alertIcon">
     <description>The image field for Alert</description>
   </element>
-<<<<<<< HEAD
   <element name="subMenuIcon">
     <description>The image field for AddSubMenu.menuIcon</description>
-=======
+  </element>
   <element name="subtleAlertIcon">
     <description>The image of the subtle alert; applies to `SubtleAlert` `alertIcon`</description>
->>>>>>> origin/develop
   </element>
 </enum>