diff --git a/docs/social_networking.md b/docs/social_networking.md
index 916d4a6..7f7afed 100644
--- a/docs/social_networking.md
+++ b/docs/social_networking.md
@@ -278,7 +278,11 @@ and the branch head in this case being the most recent response to a thread
 by a person you are following.
 
 The Distributed hash table key will be:\
+<<<<<<< Updated upstream
 `human readable area of interest name/#public key of zooko name/ 
+=======
+`#public key of zooko name/ 
+>>>>>>> Stashed changes
 human readable branch name/#hash  of data item`\
 so that items that are likely to be looked up together will likely be near
 each other on the same physical disk, and transmitted over the same
@@ -286,6 +290,19 @@ network connection.   When someone approves of a text, then it goes into a
 repository he controls or has write access to, and gets a corresponding key
 in the distributed hash table.
 
+<<<<<<< Updated upstream
+=======
+Which is not exactly a distributed hash table, for a hash table relies on the uniform distribution of hashes for its efficiency, and, because we want things likely to be looked up together at the same network address on the same physical machine, this is a very non uniform distribution.  But it will still be efficient, because by the time you walk the network past the zooko
+key, you will seldom have very far to walk.  Walk the network to the end of
+the zooko  key, you are at a machine to which that identity has write
+access, and thus, he has the authority and incentive to make things work.
+
+Rather than being a distributed hash table, this is a distributed patricia tree. 
+But it will work if the person who controls a particular Zooko name
+structures the data under his name in accordance with the characteristics of
+the lookup process, and if he does not, other people will fail to find the material in his repositories, and that is his problem, which he can  fix.
+
+>>>>>>> Stashed changes
 The messages of the people you are following are likely to be in a
 relatively small number of repositories, even if the total number of
 repositories out there is enormous and the number of hashes in each