1 files changed, 1 insertions, 3 deletions
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: {}
   }