From 8011cc3c6dc25dd78b42453becba66eb8f600f55 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Wed, 25 Mar 2020 22:26:27 -0400
Subject: [PATCH] Fix merge issues

Former-commit-id: b22d9cc27d0434578891c59825f1c8813a3a9b28
---
 src/replication.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/replication.cpp b/src/replication.cpp
index 615acb077..91ec6309a 100644
--- a/src/replication.cpp
+++ b/src/replication.cpp
@@ -3870,7 +3870,7 @@ void replicaReplayCommand(client *c)
 
     RemoteMasterState &remoteState = g_mapremote[uuid];
     if (remoteState.cFake == nullptr)
-        remoteState.cFake = createClient(-1, c->iel);
+        remoteState.cFake = createClient(nullptr, c->iel);
     else
         remoteState.cFake->iel = c->iel;
 
@@ -3885,11 +3885,6 @@ void replicaReplayCommand(client *c)
 
     // OK We've recieved a command lets execute
     client *current_clientSave = serverTL->current_client;
-<<<<<<< HEAD
-    if (cFake == nullptr)
-        cFake = createClient(nullptr, c->iel);
-=======
->>>>>>> unstable
     cFake->lock.lock();
     cFake->authenticated = c->authenticated;
     cFake->puser = c->puser;