diff --git a/services/bundlemgr_lite/BUILD.gn b/services/bundlemgr_lite/BUILD.gn
index 3503cac..2960dd3 100644
--- a/services/bundlemgr_lite/BUILD.gn
+++ b/services/bundlemgr_lite/BUILD.gn
@@ -38,8 +38,12 @@ if (ohos_kernel_type == "liteos_m") {
       defines += [ "_MINI_BMS_" ]
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     if (bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) {
+=======
+    if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) {
+>>>>>>> e679bc0515b8a5eeb2a8c69238a5f006b15efd5f
 =======
     if (bundle_framework_lite_bundle_framework_lite_enable_ohos_bundle_manager_service_permission == true) {
 >>>>>>> e679bc0515b8a5eeb2a8c69238a5f006b15efd5f