retrieved clientId and docId from client
fixed merge conflicts