fix description about zookeeper (#7598)

s/achive/achieve

docs/tutorials/stateful-application/zookeeper.md

@@ -501,8 +501,16 @@ As noted in the [Facilitating Leader Election](#facilitating-leader-election) an
 [Achieving Consensus](#achieving-consensus) sections, the servers in a
 ZooKeeper ensemble require consistent configuration in order to elect a leader
 and form a quorum. They also require consistent configuration of the Zab protocol
+<<<<<<< HEAD
 in order for the protocol to work correctly over a network. In our example we
 achieve consistent configuration by embedding the configuration directly into
+||||||| merged common ancestors
+in order for the protocol to work correctly over a network. In our example we 
+achive consistent configuration by embedding the configuration directly into 
+=======
+in order for the protocol to work correctly over a network. In our example we 
+achieve consistent configuration by embedding the configuration directly into 
+>>>>>>> fix description about zookeeper (#7598)
 the manifest.
 
 Get the `zk` StatefulSet.