diff --git a/kubernetes/README.md b/kubernetes/README.md
index cbaf86a..2326bf3 100644
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -1,5 +1,6 @@
 This is the first draft of deploying Jambonz on Kubernetes (K8S). The K8S manifests are built based on the Docker compose file in the same repository.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 # Notes
 
@@ -7,6 +8,8 @@ This is the first draft of deploying Jambonz on Kubernetes (K8S). The K8S manife
 
 =======
 >>>>>>> feat: Add K8S manifest to deploy Jambonz using Kustomize
+=======
+>>>>>>> 6ca8d8d8188d825732fcf6f40081170db0f00f17
 # Manual steps
 
 - Setup MySQL databases and tables
diff --git a/kubernetes/drachtio-sbc/drachtio-sbc-service.yaml b/kubernetes/drachtio-sbc/drachtio-sbc-service.yaml
index 3b68b92..dec5f5e 100644
--- a/kubernetes/drachtio-sbc/drachtio-sbc-service.yaml
+++ b/kubernetes/drachtio-sbc/drachtio-sbc-service.yaml
@@ -16,4 +16,7 @@ spec:
       targetPort: 5060
   selector:
     app: drachtio-sbc
+<<<<<<< HEAD
   clusterIP: None
+=======
+>>>>>>> 6ca8d8d8188d825732fcf6f40081170db0f00f17
diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml
index d385f62..4175097 100644
--- a/kubernetes/kustomization.yaml
+++ b/kubernetes/kustomization.yaml
@@ -24,4 +24,4 @@ resources:
 secretGenerator:
   - envs:
       - jambonz.env
-    name: jambonz
\ No newline at end of file
+    name: jambonz
diff --git a/kubernetes/rtpengine/rtpengine-service.yaml b/kubernetes/rtpengine/rtpengine-service.yaml
index e5cf006..fba4de0 100644
--- a/kubernetes/rtpengine/rtpengine-service.yaml
+++ b/kubernetes/rtpengine/rtpengine-service.yaml
@@ -416,7 +416,4 @@ spec:
     #   targetPort: 40100
   selector:
     app: rtpengine
-<<<<<<< HEAD
   clusterIP: None
-=======
->>>>>>> feat: Add K8S manifest to deploy Jambonz using Kustomize