Fix reconciliation logic

src/model/bucket_table.rs

@@ -75,7 +75,7 @@ impl Entry<EmptyKey, String> for Bucket {
 	}
 
 	fn merge(&mut self, other: &Self) {
-		if other.timestamp < self.timestamp {
+		if other.timestamp > self.timestamp {
 			*self = other.clone();
 			return;
 		}

src/model/key_table.rs

@@ -104,6 +104,11 @@ impl Entry<EmptyKey, String> for Key {
 	}
 
 	fn merge(&mut self, other: &Self) {
+		if other.name_timestamp > self.name_timestamp {
+			self.name_timestamp = other.name_timestamp;
+			self.name = other.name.clone();
+		}
+
 		if other.deleted {
 			self.deleted = true;
 		}
@@ -111,10 +116,6 @@ impl Entry<EmptyKey, String> for Key {
 			self.authorized_buckets.clear();
 			return;
 		}
-		if other.name_timestamp > self.name_timestamp {
-			self.name_timestamp = other.name_timestamp;
-			self.name = other.name.clone();
-		}
 
 		for ab in other.authorized_buckets.iter() {
 			match self