diff --git a/chart/templates/logging/eck-operator/peerauthentication.yaml b/chart/templates/logging/eck-operator/peerauthentication.yaml
index e0692435c4cacdf27f5cc9493d235c0b0a2fef80..017c6cb9cbb268b54490b7e5701088fadb9d94a7 100644
--- a/chart/templates/logging/eck-operator/peerauthentication.yaml
+++ b/chart/templates/logging/eck-operator/peerauthentication.yaml
@@ -1,7 +1,11 @@
 apiVersion: security.istio.io/v1beta1
 kind: PeerAuthentication
 metadata:
+<<<<<<< HEAD
   name: default
+=======
+  name: eck-operator
+>>>>>>> b581bc17... Added peerauth yaml file to eck operator
   namespace: {{ .Release.Namespace }}
 spec:
   mtls: