diff --git a/manager/src/libs/util.js b/manager/src/libs/util.js
index 47c572e1..2b46a803 100644
--- a/manager/src/libs/util.js
+++ b/manager/src/libs/util.js
@@ -1,18 +1,13 @@
-import lazyLoading from "./lazyLoading.js";
+import lazyLoading from "./lazyLoading.js";
 import { getRouter } from "./router-holder";
 import Cookies from "js-cookie";
 
 let util = {};
 
-<<<<<<< HEAD
-/** 已弃用、前端未实现的菜单 frontRoute，注册路由时跳过 */
-const DEPRECATED_FRONT_ROUTES = new Set([
-  "distribution/distrbutionGrade",
-=======
-/** 已弃用、前端已移除的菜单 frontRoute，注册路由时跳过 */
+/** 已弃用、前端未实现或已移除的菜单 frontRoute，注册路由时跳过 */
 const DEPRECATED_FRONT_ROUTES = new Set([
   "goods/goods-manage/spec",
->>>>>>> vue3
+  "distribution/distrbutionGrade",
 ]);
 
 function isDeprecatedMenu(menu) {