diff --git a/src/java/voldemort/client/AbstractStoreClientFactory.java b/src/java/voldemort/client/AbstractStoreClientFactory.java
index 89ba43b3c2..7fbbe80b33 100644
--- a/src/java/voldemort/client/AbstractStoreClientFactory.java
+++ b/src/java/voldemort/client/AbstractStoreClientFactory.java
@@ -124,6 +124,7 @@ public AbstractStoreClientFactory(ClientConfig config) {
         this.routedStoreFactory = new RoutedStoreFactory(config.isPipelineRoutedStoreEnabled(),
                                                          threadPool,
                                                          config.getTimeoutConfig());
+
         this.sequencer = new AtomicInteger(0);
 
         if(this.isJmxEnabled) {
diff --git a/src/java/voldemort/client/ClientConfig.java b/src/java/voldemort/client/ClientConfig.java
index 4751f74be8..20ca113355 100644
--- a/src/java/voldemort/client/ClientConfig.java
+++ b/src/java/voldemort/client/ClientConfig.java
@@ -717,8 +717,8 @@ public long getAsyncCheckMetadataInterval() {
         return asyncCheckMetadataInterval;
     }
 
-    public void setAsyncCheckMetadataInterval(long asyncCheckMetadataInterval) {
+    public ClientConfig setAsyncCheckMetadataInterval(long asyncCheckMetadataInterval) {
         this.asyncCheckMetadataInterval = asyncCheckMetadataInterval;
+        return this;
     }
-
 }
diff --git a/src/java/voldemort/client/DefaultStoreClient.java b/src/java/voldemort/client/DefaultStoreClient.java
index 436fcfd292..bc313fbbc4 100644
--- a/src/java/voldemort/client/DefaultStoreClient.java
+++ b/src/java/voldemort/client/DefaultStoreClient.java
@@ -19,8 +19,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.UUID;
+import java.util.Map.Entry;
 import java.util.concurrent.Callable;
 
 import org.apache.log4j.Logger;
@@ -71,13 +71,6 @@ public class DefaultStoreClient<K, V> implements StoreClient<K, V> {
     private final Map<String, SystemStore> sysStoreMap;
     private AsyncMetadataVersionManager asyncCheckMetadata;
 
-    // Enumerate all the system stores
-    private final String METADATA_VERSION_STORE = "voldsys$_metadata_version";
-    private final String CLIENT_REGISTRY_STORE = "voldsys$_client_registry";
-    private final String STORE_DEFINITION_STORE = "voldsys$_client_store_definition";
-    private final String[] systemStoreNames = { METADATA_VERSION_STORE, CLIENT_REGISTRY_STORE,
-            STORE_DEFINITION_STORE };
-
     public DefaultStoreClient(String storeName,
                               InconsistencyResolver<Versioned<V>> resolver,
                               StoreClientFactory storeFactory,
diff --git a/src/java/voldemort/client/StoreClientFactory.java b/src/java/voldemort/client/StoreClientFactory.java
index ee008d98af..59070fbd96 100644
--- a/src/java/voldemort/client/StoreClientFactory.java
+++ b/src/java/voldemort/client/StoreClientFactory.java
@@ -87,6 +87,7 @@ <K, V, T> Store<K, V, T> getRawStore(String storeName,
                                          UUID clientId);
 
     /**
+<<<<<<< HEAD
      * Get the underlying store, not the public StoreClient interface
      * 
      * @param storeName The name of the store
@@ -101,6 +102,8 @@ <K, V, T> Store<K, V, T> getRawStore(String storeName,
                                          String customStoresXml);
 
     /**
+=======
+>>>>>>> add clientId for voldemort client
      * Close the store client
      */
     public void close();