diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 31bdd5a58..d6d20aa0f 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -1,7 +1,6 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-<<<<<<< HEAD
   [{"4.4.5",
     [
      {load_module,emqx_relup,brutal_purge,soft_purge,[]},