diff --git a/src/main/java/gift/controller/OptionController.java b/src/main/java/gift/controller/OptionController.java
index b0c3d87f1..20d995bc7 100644
--- a/src/main/java/gift/controller/OptionController.java
+++ b/src/main/java/gift/controller/OptionController.java
@@ -5,8 +5,10 @@
 import gift.dto.option.OptionResponse;
 import gift.dto.option.OptionUpdateResponse;
 import gift.entity.Option;
+import gift.exception.CustomException;
 import gift.service.OptionService;
 import jakarta.validation.Valid;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
@@ -47,8 +49,7 @@ public ResponseEntity<OptionResponse> addOptionToProduct(
             UriComponentsBuilder uriBuilder) {
         Option option = optionService.addOptionToProduct(productId, optionRequest);
         OptionResponse response = new OptionResponse(option.getId(), option.getName(), option.getQuantity());
-        URI location = uriBuilder.path("/api/products/{productId}/options/{optionId}")
-                .buildAndExpand(productId, option.getId()).toUri();
+        URI location = uriBuilder.path("/api/products/{productId}/options/{optionId}").buildAndExpand(productId, option.getId()).toUri();
         return ResponseEntity.created(location).body(response);
     }
 
@@ -72,8 +73,15 @@ public ResponseEntity<String> deleteOption(
             @PathVariable Long optionId,
             @Parameter(description = "ID of the product", required = true)
             @RequestBody DeleteOptionRequest deleteOptionRequest) {
-        optionService.deleteOption(optionId, deleteOptionRequest.getEmail(), deleteOptionRequest.getPassword());
-        return ResponseEntity.ok("Option successfully deleted.");
+        try {
+            optionService.deleteOption(optionId, DeleteOptionRequest.getEmail(), DeleteOptionRequest.getPassword());
+            return ResponseEntity.ok("Option successfully deleted.");
+        } catch (CustomException.EntityNotFoundException e) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage());
+        } catch (CustomException.InvalidPasswordException e) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(e.getMessage());
+        } catch (Exception e) {
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("An error occurred: " + e.getMessage());
+        }
     }
 }
-
diff --git a/src/main/java/gift/controller/ProductController.java b/src/main/java/gift/controller/ProductController.java
index 9da276cd2..4bc60c27b 100644
--- a/src/main/java/gift/controller/ProductController.java
+++ b/src/main/java/gift/controller/ProductController.java
@@ -116,6 +116,7 @@ public ResponseEntity<ProductResponse> updateProduct(
     public ResponseEntity<String> deleteProduct(
             @Parameter(description = "ID of the product to be deleted", required = true)
             @PathVariable Long id) {
+        productService.deleteById(id);
         try {
             productService.deleteById(id);
             return ResponseEntity.ok("성공적으로 삭제되었습니다.");
diff --git a/src/main/java/gift/controller/WishController.java b/src/main/java/gift/controller/WishController.java
index 534eedfe5..2ed0a12ef 100644
--- a/src/main/java/gift/controller/WishController.java
+++ b/src/main/java/gift/controller/WishController.java
@@ -18,6 +18,7 @@
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.servlet.http.HttpServletRequest;
+import java.util.List;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
diff --git a/src/main/java/gift/entity/Order.java b/src/main/java/gift/entity/Order.java
index d14a10a8a..c9e64ae36 100644
--- a/src/main/java/gift/entity/Order.java
+++ b/src/main/java/gift/entity/Order.java
@@ -47,6 +47,10 @@ public String getEmail() {
         return email;
     }
 
+    public LocalDateTime getOrderTime() {
+        return orderDateTime;
+    }
+
     public static class Builder {
         private Long id;
         private Long optionId;
diff --git a/src/main/java/gift/entity/Product.java b/src/main/java/gift/entity/Product.java
index 5af9831bc..3ef614b51 100644
--- a/src/main/java/gift/entity/Product.java
+++ b/src/main/java/gift/entity/Product.java
@@ -36,9 +36,6 @@ public class Product {
     @OneToMany(mappedBy = "product", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<Option> options = new ArrayList<>();
 
-    @OneToMany(mappedBy = "product", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Wish> wishes = new ArrayList<>();
-
     private Product(Builder builder) {
         this.id = builder.id;
         this.name = builder.name;
diff --git a/src/main/java/gift/exception/CustomException.java b/src/main/java/gift/exception/CustomException.java
index 5a8989834..001e00315 100644
--- a/src/main/java/gift/exception/CustomException.java
+++ b/src/main/java/gift/exception/CustomException.java
@@ -27,13 +27,10 @@ public static class InvalidQuantityException extends RuntimeException {
         public InvalidQuantityException(String message) {super(message);}
     }
 
-<<<<<<< HEAD
     public static class InvalidPasswordException extends RuntimeException {
         public InvalidPasswordException(String message) {super(message);}
     }
 
-=======
->>>>>>> e3b9ef38d18104514aa1d0951ff1a098ff9a093f
     public static class GenericException extends RuntimeException {
         public GenericException(String message) {
             super(message);
@@ -42,13 +39,10 @@ public GenericException(String message, Throwable cause) {
             super(message, cause);
         }
     }
-<<<<<<< HEAD
 
-    public static class EntityAlreadyExistException extends RuntimeException {
-        public EntityAlreadyExistException(String message) {
-            super(message);
+    public static class EntityAlreadyExistException extends Throwable {
+        public EntityAlreadyExistException(String s) {
+            super(s);
         }
     }
-=======
->>>>>>> e3b9ef38d18104514aa1d0951ff1a098ff9a093f
 }
diff --git a/src/main/java/gift/service/OptionService.java b/src/main/java/gift/service/OptionService.java
index ee0b0db55..6457dbe11 100644
--- a/src/main/java/gift/service/OptionService.java
+++ b/src/main/java/gift/service/OptionService.java
@@ -58,7 +58,8 @@ public Option addOptionToProduct(Long productId, OptionRequest optionRequest) {
         Option option = new Option.Builder()
                 .name(optionRequest.getName())
                 .quantity(optionRequest.getQuantity())
-                .product(product).build();
+                .product(product)
+                .build();
         optionRepository.save(option);
 
         product.getOptions().add(option);
@@ -66,7 +67,6 @@ public Option addOptionToProduct(Long productId, OptionRequest optionRequest) {
     }
 
     public void deleteOption(Long optionId, String email, String password) {
-        System.out.println("email: " + email);
         Option deletedOption = optionRepository.findById(optionId).orElseThrow(()-> new CustomException.EntityNotFoundException("Option not found"));
         Member member = memberService.findByEmail(email).orElseThrow(()-> new CustomException.EntityNotFoundException("Member not found"));
         memberService.verifyPassword(member, password);
diff --git a/src/main/java/gift/service/OrderService.java b/src/main/java/gift/service/OrderService.java
index 9ab4e6842..3a68bbd0e 100644
--- a/src/main/java/gift/service/OrderService.java
+++ b/src/main/java/gift/service/OrderService.java
@@ -42,7 +42,7 @@ public OrderResponse placeOrder(OrderRequest orderRequest) {
                 order.getId(),
                 order.getOptionId(),
                 order.getQuantity(),
-                order.getOrderDateTime(),
+                order.getOrderTime(),
                 order.getMessage()
         );
     }
@@ -54,7 +54,7 @@ public Page<OrderResponse> getOrdersByEmail(String email, Pageable pageable) {
                 order.getId(),
                 order.getOptionId(),
                 order.getQuantity(),
-                order.getOrderDateTime(),
+                order.getOrderTime(),
                 order.getMessage()
         ));
     }
diff --git a/src/main/java/gift/service/WishService.java b/src/main/java/gift/service/WishService.java
index adbeffeba..44537af3b 100644
--- a/src/main/java/gift/service/WishService.java
+++ b/src/main/java/gift/service/WishService.java
@@ -46,7 +46,7 @@ public Wish updateWish(Long wishId) {
         return wishRepository.save(wish);
     }
 
-    public Wish createWish(Member member,Product product, int quantity) {
+    public Wish createWish(Member member,Product product, int quantity) throws CustomException.EntityAlreadyExistException {
         Optional<Wish> existingWish = wishRepository.findByMemberAndProduct(member, product);
         if(existingWish.isPresent()) {
             throw new CustomException.EntityAlreadyExistException("Wish already exist for this product");
diff --git a/src/main/java/gift/util/ProductValidator.java b/src/main/java/gift/util/ProductValidator.java
index a6299297c..e731cb1b7 100644
--- a/src/main/java/gift/util/ProductValidator.java
+++ b/src/main/java/gift/util/ProductValidator.java
@@ -1,12 +1,7 @@
 package gift.util;
 
-<<<<<<< HEAD
 import gift.dto.option.OptionRequest;
 import gift.dto.product.ProductRequest;
-=======
-import gift.dto.OptionRequest;
-import gift.dto.ProductRequest;
->>>>>>> e3b9ef38d18104514aa1d0951ff1a098ff9a093f
 
 public class ProductValidator {
     public static void validateProductRequest(ProductRequest productRequest) {
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 93efecb00..f006c0ced 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -14,4 +14,4 @@ INSERT INTO options (name, quantity, product_id) VALUES ('Option1', 100, 1);
 INSERT INTO options (name, quantity, product_id) VALUES ('Option2', 200, 1);
 
 -- wish
-INSERT INTO wish (member_id, product_id, quantity, created_date) VALUES (1, 1, 1, NOW());
+INSERT INTO wish (member_id, product_id) VALUES (1, 1);
diff --git a/src/test/java/gift/service/OrderServiceTest.java b/src/test/java/gift/service/OrderServiceTest.java
index 300e9403d..0c8a1bff5 100644
--- a/src/test/java/gift/service/OrderServiceTest.java
+++ b/src/test/java/gift/service/OrderServiceTest.java
@@ -33,7 +33,7 @@ public void setUp() {
 
     @Test
     public void PlaceOrderSuccess() {
-        OrderRequest orderRequest = new OrderRequest(1L, 1L, 1, "Test message", LocalDateTime.now(), "user@example.com");
+        OrderRequest orderRequest = new OrderRequest(1L, 1L, 1,"Test message", LocalDateTime.now(), "user@example.com");
 
         Order order = new Order.Builder()
                 .id(1L)