diff --git a/fdbclient/StorageServerInterface.h b/fdbclient/StorageServerInterface.h
index 04bb375dd4..13ba8f1e18 100644
--- a/fdbclient/StorageServerInterface.h
+++ b/fdbclient/StorageServerInterface.h
@@ -158,13 +158,9 @@ public:
 				checkpoint =
 				    PublicRequestStream<struct GetCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(19));
 				fetchCheckpoint =
-<<<<<<< variant A
 				    PublicRequestStream<struct FetchCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(20));
->>>>>>> variant B
-				    RequestStream<struct FetchCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(20));
-				fetchCheckpointKeyValues = RequestStream<struct FetchCheckpointKeyValuesRequest>(
+				fetchCheckpointKeyValues = PublicRequestStream<struct FetchCheckpointKeyValuesRequest>(
 				    getValue.getEndpoint().getAdjustedEndpoint(21));
-======= end
 			}
 		} else {
 			ASSERT(Ar::isDeserializing);
diff --git a/fdbrpc/sim2.actor.cpp b/fdbrpc/sim2.actor.cpp
index 2b3cdb420c..05e2f513ce 100644
--- a/fdbrpc/sim2.actor.cpp
+++ b/fdbrpc/sim2.actor.cpp
@@ -445,7 +445,7 @@ private:
 		TraceEvent(SevError, "LeakedConnection", self->dbgid)
 		    .error(connection_leaked())
 		    .detail("MyAddr", self->process->address)
-			.detail("IsPublic", self->process->address.isPublic())
+		    .detail("IsPublic", self->process->address.isPublic())
 		    .detail("PeerAddr", self->peerEndpoint)
 		    .detail("PeerId", self->peerId)
 		    .detail("Opened", self->opened);
diff --git a/fdbserver/workloads/ClientWorkload.actor.cpp b/fdbserver/workloads/ClientWorkload.actor.cpp
index 390745177a..831825ed7e 100644
--- a/fdbserver/workloads/ClientWorkload.actor.cpp
+++ b/fdbserver/workloads/ClientWorkload.actor.cpp
@@ -32,9 +32,7 @@ class WorkloadProcessState {
 	Future<Void> processActor;
 	Promise<Void> init;
 
-	WorkloadProcessState(int clientId) : clientId(clientId) {
-		processActor = processStart(this);
-	}
+	WorkloadProcessState(int clientId) : clientId(clientId) { processActor = processStart(this); }
 
 	~WorkloadProcessState() {
 		TraceEvent("ShutdownClientForWorkload", id).log();
@@ -64,17 +62,19 @@ class WorkloadProcessState {
 		auto locality = LocalityData(Optional<Standalone<StringRef>>(), newZoneId, newZoneId, parent->locality.dcId());
 		auto dataFolder = joinPath(popPath(parent->dataFolder), deterministicRandom()->randomUniqueID().toString());
 		platform::createDirectory(dataFolder);
-		TraceEvent("StartingClientForWorkload", self->id).detail("Name", self->processName).detail("Address", self->childAddress);
+		TraceEvent("StartingClientForWorkload", self->id)
+		    .detail("Name", self->processName)
+		    .detail("Address", self->childAddress);
 		self->childProcess = g_simulator.newProcess(self->processName.c_str(),
-		                                      self->childAddress,
-		                                      1,
-		                                      parent->address.isTLS(),
-		                                      1,
-		                                      locality,
-		                                      ProcessClass(ProcessClass::TesterClass, ProcessClass::AutoSource),
-		                                      dataFolder.c_str(),
-		                                      parent->coordinationFolder,
-		                                      parent->protocolVersion);
+		                                            self->childAddress,
+		                                            1,
+		                                            parent->address.isTLS(),
+		                                            1,
+		                                            locality,
+		                                            ProcessClass(ProcessClass::TesterClass, ProcessClass::AutoSource),
+		                                            dataFolder.c_str(),
+		                                            parent->coordinationFolder,
+		                                            parent->protocolVersion);
 		self->childProcess->excludeFromRestarts = true;
 		wait(g_simulator.onProcess(self->childProcess, TaskPriority::DefaultYield));
 		try {