1 files changed, 1 insertions, 3 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>(); }
   }