diff --git a/charts/nemo/custom-values.yaml b/charts/nemo/custom-values.yaml
index f5e83ef..d3274a6 100644
--- a/charts/nemo/custom-values.yaml
+++ b/charts/nemo/custom-values.yaml
@@ -9,8 +9,8 @@ imagePullSecrets:
 data-store:
   enabled: true
   external:
-    rootUrl: https://nemo-datastore.hopt.paasup.io
-    domain: nemo-datastore.hopt.paasup.io
+    rootUrl: https://nemo-datastore.example.com
+    domain: nemo-datastore.example.com
 
 customizer:
   enabled: true
@@ -60,7 +60,6 @@ ingress:
   className: "kong"
   tls:
     - hosts:
-<<<<<<< HEAD
         - nemo.example.com
       secretName: nemo-tls
   hosts:
@@ -70,18 +69,6 @@ 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:
   enabled: false