diff --git a/charts/nemo/custom-values.yaml b/charts/nemo/custom-values.yaml
index a494f76..f5e83ef 100644
--- a/charts/nemo/custom-values.yaml
+++ b/charts/nemo/custom-values.yaml
@@ -60,6 +60,7 @@ ingress:
   className: "kong"
   tls:
     - hosts:
+<<<<<<< HEAD
         - nemo.example.com
       secretName: nemo-tls
   hosts:
@@ -69,6 +70,17 @@ ingress:
       name: nim.example.com
     dataStore:
       name: data-store.example.com
+=======
+        - nemo.hopt.paasup.io
+      secretName: nemo-tls
+  hosts:
+    default:
+      name: "nemo.hopt.paasup.io"
+    nimProxy:
+      name: nim.hopt.paasup.io
+    dataStore:
+      name: data-store.hopt.paasup.io
+>>>>>>> fc78110cec14da33f1b646364f57ee54c4269cdf
 
 # Istio를 사용하지 않기 때문에 비활성화
 virtualService: