diff --git a/definitions/peer/deployment.yaml b/definitions/peer/deployment.yaml
index ab5c85af..8ea7033f 100644
--- a/definitions/peer/deployment.yaml
+++ b/definitions/peer/deployment.yaml
@@ -33,8 +33,6 @@ spec:
         - env:
             - name: LICENSE
               value: accept
-<<<<<<< HEAD
-=======
           image: ""
           imagePullPolicy: Always
           livenessProbe:
@@ -76,7 +74,6 @@ spec:
         - env:
             - name: LICENSE
               value: accept
->>>>>>> 23b15af (Disable unshare in the pod containers (#179))
             - name: CORE_PEER_LISTENADDRESS
               value: 0.0.0.0:7051
             - name: CORE_PEER_CHAINCODELISTENADDRESS
@@ -282,4 +279,4 @@ spec:
         fsGroup: 2000
         runAsGroup: 1000
         runAsNonRoot: true
-        runAsUser: 1000
+        runAsUser: 1000
\ No newline at end of file