resolve merge conflict in stores.xml

test/common/voldemort/config/stores.xml

@@ -185,14 +185,25 @@
     <hinted-handoff-strategy>all-handoff</hinted-handoff-strategy> 
     <hint-preflist-size>10</hint-preflist-size>
   </store>
+
   <store>
-<<<<<<< HEAD
     <name>test-store-eventual-1</name>
     <persistence>bdb</persistence>
-=======
+    <routing>client</routing>
+    <replication-factor>2</replication-factor>
+    <required-reads>1</required-reads>
+    <required-writes>1</required-writes>
+    <key-serializer>
+      <type>string</type>
+      <schema-info>UTF-8</schema-info>
+    </key-serializer>
+    <value-serializer>    
+      <type>java-serialization</type>
+    </value-serializer>
+  </store>    
+  <store>
     <name>test-basic-replication-memory</name>
     <persistence>memory</persistence>
->>>>>>> 1e726e7... Updated async metadata checker for both stores and cluster.xml. Updated DefaultSocketStoreClientTest. Moved system stores repository to a new class.
     <routing>client</routing>
     <replication-factor>2</replication-factor>
     <required-reads>1</required-reads>
@@ -201,11 +212,11 @@
       <type>string</type>
       <schema-info>UTF-8</schema-info>
     </key-serializer>
-    <value-serializer>
-<<<<<<< HEAD
-      <type>java-serialization</type>
+    <value-serializer>    
+     <type>string</type>
+      <schema-info>UTF-8</schema-info>
     </value-serializer>
-  </store>
+  </store>    
   <store>
     <name>test-store-eventual-2</name>
     <persistence>bdb</persistence>
@@ -219,10 +230,6 @@
     </key-serializer>
     <value-serializer>
       <type>java-serialization</type>
-=======
-      <type>string</type>
-      <schema-info>UTF-8</schema-info>
->>>>>>> 1e726e7... Updated async metadata checker for both stores and cluster.xml. Updated DefaultSocketStoreClientTest. Moved system stores repository to a new class.
     </value-serializer>
   </store>
 </stores>