diff --git a/plm-api/src/controllers/app/common/product.controller.js b/plm-api/src/controllers/app/common/product.controller.js
index fa0bbfb..0f2b3bf 100644
--- a/plm-api/src/controllers/app/common/product.controller.js
+++ b/plm-api/src/controllers/app/common/product.controller.js
@@ -46,7 +46,12 @@ router.put(
   "/productUpdate/:id",
   [
     param("id").isUUID().withMessage("유효한 ID가 필요합니다"),
+<<<<<<< HEAD
     body("product_name").optional().notEmpty().withMessage("제품군 이름이 필요합니다."),
+=======
+    body("product_code").optional().notEmpty().withMessage("제품 코드가 필요합니다."),
+    body("product_name").optional().notEmpty().withMessage("제품 이름이 필요합니다."),
+>>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
     body("companyId").optional().isUUID().withMessage("유효한 회사 ID가 필요합니다"),
     validate,
   ],
diff --git a/plm-api/src/services/product.service.js b/plm-api/src/services/product.service.js
index 456958b..c751173 100644
--- a/plm-api/src/services/product.service.js
+++ b/plm-api/src/services/product.service.js
@@ -152,7 +152,11 @@ class productService {
 
     await alertService.createAlert({
       type: "info",
+<<<<<<< HEAD
       message: `제품 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
+=======
+      message: `제품군 ${productName}이(가) ${currentUser.name}에 의해 삭제되었습니다.`,
+>>>>>>> 996616fc2324b66b3ae033eced43180612cac2bf
       companyId: companyId,
     });