fix some typos and resolve conflicts

docs/tutorials/stateful-application/basic-stateful-set.md

@@ -11,7 +11,7 @@ title: StatefulSet Basics
 ---
 
 {% capture overview %}
-This tutorial provides an introduction to managing applications with
+This tutorial provides an introduction to manage applications with
 [StatefulSets](/docs/concepts/abstractions/controllers/statefulsets/). It 
 demonstrates how to create, delete, scale, and update the container image of a 
 StatefulSet.
@@ -122,7 +122,7 @@ launching `web-1`. In fact, `web-1` is not launched until `web-0` is
 [Running and Ready](/docs/user-guide/pod-states). 
 
 ### Pods in a StatefulSet
-Unlike Pods in other controllers, the Pods in a StatefulSet have a unqiue 
+Unlike Pods in other controllers, the Pods in a StatefulSet have a unique 
 ordinal index and a stable network identity.
 
 #### Examining the Pod's Ordinal Index
@@ -177,7 +177,7 @@ Name:      web-1.nginx
 Address 1: 10.244.2.6
 ```
 
-The CNAME of the headless serivce points to SRV records (one for each Pod that 
+The CNAME of the headless service points to SRV records (one for each Pod that 
 is Running and Ready). The SRV records point to A record entries that 
 contain the Pods' IP addresses. 
 

docs/tutorials/stateful-application/run-replicated-stateful-application.md

@@ -180,7 +180,7 @@ replicating.
 In general, when a new Pod joins the set as a slave, it must assume the MySQL
 master might already have data on it. It also must assume that the replication
 logs might not go all the way back to the beginning of time.
-These conservative assumptions are the key to allowing a running StatefulSet
+These conservative assumptions are the key to allow a running StatefulSet
 to scale up and down over time, rather than being fixed at its initial size.
 
 The second Init Container, named `clone-mysql`, performs a clone operation on