diff --git a/src/main/java/org/apache/gossip/GossipService.java b/src/main/java/org/apache/gossip/GossipService.java
index d07c070..866dc03 100644
--- a/src/main/java/org/apache/gossip/GossipService.java
+++ b/src/main/java/org/apache/gossip/GossipService.java
@@ -60,10 +60,6 @@ public class GossipService {
   public GossipService(String cluster, URI uri, String id,
           List<GossipMember> gossipMembers, GossipSettings settings, GossipListener listener)
           throws InterruptedException, UnknownHostException {
-<<<<<<< HEAD
-    gossipManager = new RandomGossipManager(cluster, uri, id, settings, gossipMembers,
-            listener);
-=======
     gossipManager = RandomGossipManager.newBuilder()
         .withId(id)
         .cluster(cluster)
@@ -73,7 +69,6 @@ public class GossipService {
         .gossipMembers(gossipMembers)
         .listener(listener)
         .build();
->>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager (Jaideep Dhok via EGC)
   }
 
   public void start() {
diff --git a/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java b/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
index 100b237..7aa4435 100644
--- a/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
+++ b/src/main/java/org/apache/gossip/manager/random/RandomGossipManager.java
@@ -23,89 +23,11 @@ import org.apache.gossip.event.GossipListener;
 import org.apache.gossip.manager.GossipManager;
 import org.apache.gossip.manager.impl.OnlyProcessReceivedPassiveGossipThread;
 
-<<<<<<< HEAD
 import java.net.URI;
 import java.util.List;
 
 public class RandomGossipManager extends GossipManager {
   public RandomGossipManager(String cluster, URI uri, String id,
-=======
-import java.util.ArrayList;
-import java.util.List;
-
-public class RandomGossipManager extends GossipManager {
-
-  public static ManagerBuilder newBuilder() {
-    return new ManagerBuilder();
-  }
-
-  public static final class ManagerBuilder {
-    private String cluster;
-    private String address;
-    private int port;
-    private String id;
-    private GossipSettings settings;
-    private List<GossipMember> gossipMembers;
-    private GossipListener listener;
-
-    private ManagerBuilder() {}
-
-    private void checkArgument(boolean check, String msg) {
-      if (!check) {
-        throw new IllegalArgumentException(msg);
-      }
-    }
-
-    public ManagerBuilder cluster(String cluster) {
-      this.cluster = cluster;
-      return this;
-    }
-
-    public ManagerBuilder address(String address) {
-      this.address = address;
-      return this;
-    }
-
-    public ManagerBuilder port(int port) {
-      this.port = port;
-      return this;
-    }
-
-    public ManagerBuilder withId(String id) {
-      this.id = id;
-      return this;
-    }
-
-    public ManagerBuilder settings(GossipSettings settings) {
-      this.settings = settings;
-      return this;
-    }
-
-    public ManagerBuilder gossipMembers(List<GossipMember> members) {
-      this.gossipMembers = members;
-      return this;
-    }
-
-    public ManagerBuilder listener(GossipListener listener) {
-      this.listener = listener;
-      return this;
-    }
-
-    public RandomGossipManager build() {
-      checkArgument(id != null, "You must specify an id");
-      checkArgument(cluster != null, "You must specify a cluster name");
-      checkArgument(settings != null, "You must specify gossip settings");
-
-      if (this.gossipMembers == null) {
-        this.gossipMembers = new ArrayList<>();
-      }
-
-      return new RandomGossipManager(cluster, address, port, id, settings, gossipMembers, listener);
-    }
-  }
-
-  private RandomGossipManager(String cluster, String address, int port, String id,
->>>>>>> fe196cd... GOSSIP-4: Use builder to create RandomGossipManager (Jaideep Dhok via EGC)
                              GossipSettings settings, List<GossipMember> gossipMembers, GossipListener listener) {
     super(OnlyProcessReceivedPassiveGossipThread.class, RandomActiveGossipThread.class, cluster,
             uri, id, settings, gossipMembers, listener);