fixed a few missed merge conflicts

content/en/docs/concepts/configuration/secret.md

@@ -706,14 +706,7 @@ SecretGenerator:
 ```
 Create the SecretObject on Apiserver:
 ```shell
-<<<<<<< HEAD
 $ kubectl apply -k .
-=======
-kubectl create secret generic ssh-key-secret --from-file=ssh-privatekey=/path/to/.ssh/id_rsa 
-```
-```
---from-file=ssh-publickey=/path/to/.ssh/id_rsa.pub
->>>>>>> master
 ```
 
 {{< caution >}}
@@ -762,8 +755,7 @@ credentials.
 
 Make the kustomization.yaml with SecretGenerator
 ```shell
-<<<<<<< HEAD
-$ cat <<EOF > kustomization.yaml
+cat <<EOF > kustomization.yaml
 secretGenerator:
 - name: prod-db-secret
   literals:
@@ -774,21 +766,6 @@ secretGenerator:
   - username=testuser
   - password=iluvtests
 EOF
-=======
-kubectl create secret generic prod-db-secret --from-literal=username=produser 
---from-literal=password=Y4nys7f11
-```
-
-```
-secret "prod-db-secret" created
-```
-
-```shell
-kubectl create secret generic test-db-secret --from-literal=username=testuser --from-literal=password=iluvtests
-```
-```
-secret "test-db-secret" created
->>>>>>> master
 ```
 
 Now make the pods:

content/en/docs/concepts/services-networking/connect-applications-service.md

@@ -231,15 +231,10 @@ Till now we have only accessed the nginx server from within the cluster. Before
 You can acquire all these from the [nginx https example](https://github.com/kubernetes/examples/tree/{{< param "githubbranch" >}}/staging/https-nginx/). This requires having go and make tools installed. If you don't want to install those, then follow the manual steps later. In short:
 
 ```shell
-<<<<<<< HEAD
-$ make keys secret KEY=/tmp/nginx.key CERT=/tmp/nginx.crt SECRET=/tmp/secret.json
-$ kubectl apply -f /tmp/secret.json
-=======
 make keys secret KEY=/tmp/nginx.key CERT=/tmp/nginx.crt SECRET=/tmp/secret.json
-kubectl create -f /tmp/secret.json
+kubectl apply -f /tmp/secret.json
 ```
 ```
->>>>>>> master
 secret/nginxsecret created
 ```
 ```shell
@@ -274,15 +269,10 @@ data:
 Now create the secrets using the file:
 
 ```shell
-<<<<<<< HEAD
-$ kubectl apply -f nginxsecrets.yaml
-$ kubectl get secrets
-=======
-kubectl create -f nginxsecrets.yaml
+kubectl apply -f nginxsecrets.yaml
 kubectl get secrets
 ```
 ```
->>>>>>> master
 NAME                  TYPE                                  DATA      AGE
 default-token-il9rc   kubernetes.io/service-account-token   1         1d
 nginxsecret           Opaque                                2         1m
@@ -302,11 +292,7 @@ Noteworthy points about the nginx-secure-app manifest:
   This is setup *before* the nginx server is started.
 
 ```shell
-<<<<<<< HEAD
-$ kubectl delete deployments,svc my-nginx; kubectl apply -f ./nginx-secure-app.yaml
-=======
 kubectl delete deployments,svc my-nginx; kubectl create -f ./nginx-secure-app.yaml
->>>>>>> master
 ```
 
 At this point you can reach the nginx server from any node.
@@ -326,15 +312,10 @@ Let's test this from a pod (the same secret is being reused for simplicity, the
 {{< codenew file="service/networking/curlpod.yaml" >}}
 
 ```shell
-<<<<<<< HEAD
-$ kubectl apply -f ./curlpod.yaml
-$ kubectl get pods -l app=curlpod
-=======
-kubectl create -f ./curlpod.yaml
+kubectl apply -f ./curlpod.yaml
 kubectl get pods -l app=curlpod
 ```
 ```
->>>>>>> master
 NAME                               READY     STATUS    RESTARTS   AGE
 curl-deployment-1515033274-1410r   1/1       Running   0          1m
 ```

content/en/docs/concepts/workloads/pods/init-containers.md

@@ -240,13 +240,9 @@ Once we start the `mydb` and `myservice` services, we can see the Init Container
 complete and the `myapp-pod` is created:
 
 ```shell
-<<<<<<< HEAD
-$ kubectl apply -f services.yaml
-=======
-kubectl create -f services.yaml
+kubectl apply -f services.yaml
 ```
 ```
->>>>>>> master
 service/myservice created
 service/mydb created
 ```