Fixed conflicts

kvs/src/kvs/server.cpp

@@ -598,6 +598,10 @@ void run(unsigned thread_id, Address public_ip, Address private_ip,
       // Reset sketch for next epoch
       sketch->reset();
 
+<<<<<<< HEAD
+=======
+      // report key size stats
+>>>>>>> 37bca4c5bad13ccb3ee86293ecb75cc56c998d35
       KeySizeData primary_key_size;
       for (const auto& key_pair : stored_key_map) {
         if (is_primary_replica(key_pair.first, key_replication_map,

kvs/src/monitor/movement_policy.cpp

@@ -129,11 +129,13 @@ void movement_policy(logger log, map<TierId, GlobalHashRing>& global_hash_rings,
   total_rep_to_change = 0;
 
   // reduce the replication factor of some keys that are not so hot anymore
+<<<<<<< HEAD
   KeyReplication minimum_rep =
       create_new_replication_vector(1, kMinimumReplicaNumber - 1, 1, 1);
   for (const auto& key_access_pair : cold_key_access_summary) {
     Key key = key_access_pair.first;
     unsigned access_count = key_access_pair.second;
+
     if (!is_metadata(key) && !(key_replication_map[key] == minimum_rep)) {
       log->info("Key {} accessed {} times (threshold is {}).", key,
                 access_count, ss.cold_key_access_mean + ss.cold_key_access_std);