diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index f5fb5b0ba..8a0a2d4ff 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -28,13 +28,8 @@
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
-<<<<<<< HEAD
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
-=======
-     {load_module,emqx,brutal_purge,soft_purge,[]},
-     {load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
->>>>>>> 8e5674f14 (chore: update appup.src)
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
diff --git a/src/emqx.erl b/src/emqx.erl
index 4892fa6cc..ae78e5795 100644
--- a/src/emqx.erl
+++ b/src/emqx.erl
@@ -228,7 +228,7 @@ shutdown() ->
 
 shutdown(Reason) ->
     ?LOG(critical, "emqx shutdown for ~s", [Reason]),
-    on_shutdown_hook(Reason),
+    on_shutdown(Reason),
     _ = emqx_plugins:unload(),
     lists:foreach(fun application:stop/1
                  , lists:reverse(default_started_applications())
@@ -240,11 +240,11 @@ reboot() ->
             _ = application:stop(emqx_dashboard), %% dashboard must be started after mnesia
             lists:foreach(fun application:start/1 , default_started_applications()),
             _ = application:start(emqx_dashboard),
-            on_reboot_hooks();
+            on_reboot();
 
         false ->
             lists:foreach(fun application:start/1 , default_started_applications()),
-            on_reboot_hooks()
+            on_reboot()
     end.
 
 is_application_running(App) ->
@@ -260,7 +260,7 @@ default_started_applications() ->
 -endif.
 
 -ifdef(EMQX_ENTERPRISE).
-on_reboot_hooks() ->
+on_reboot() ->
     try
         _ = emqx_license_api:bootstrap_license(),
         ok
@@ -271,17 +271,17 @@ on_reboot_hooks() ->
     end,
     ok.
 
-on_shutdown_hook(join) ->
+on_shutdown(join) ->
     emqx_modules:sync_load_modules_file(),
     ok;
-on_shutdown_hook(_) ->
+on_shutdown(_) ->
     ok.
 
 -else.
-on_reboot_hooks() ->
+on_reboot() ->
     ok.
 
-on_shutdown_hook(_) ->
+on_shutdown(_) ->
     ok.
 -endif.