yaml fix

k8s/client/netclient-daemonset.yaml

@@ -16,11 +16,7 @@ spec:
       hostNetwork: true
       containers:
       - name: netclient
-<<<<<<< HEAD
         image: gravitl/netclient:v0.17.0
-=======
-        image: gravitl/netclient:v0.16.3
->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4
         env:
         - name: TOKEN
           value: "TOKEN_VALUE"

k8s/server/netmaker-server.yaml

@@ -83,11 +83,7 @@ spec:
           value: "Kubernetes"
         - name: VERBOSITY
           value: "3"
-<<<<<<< HEAD
         image: gravitl/netmaker:v0.17.0
-=======
-        image: gravitl/netmaker:v0.16.3
->>>>>>> 407c6ed20a427153acb4901db7e61d3016823cc4
         imagePullPolicy: Always
         name: netmaker
         ports:
@@ -132,7 +128,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-  name: 'netmaker-wireguard'
+    name: 'netmaker-wireguard'
 spec:
   externalTrafficPolicy: Local
   type: NodePort