diff --git a/src/main/java/com/gmail/nossr50/database/queuemanager/AsyncQueueManager.java b/src/main/java/com/gmail/nossr50/database/queuemanager/AsyncQueueManager.java
index 73bad274c..5def6bb7f 100644
--- a/src/main/java/com/gmail/nossr50/database/queuemanager/AsyncQueueManager.java
+++ b/src/main/java/com/gmail/nossr50/database/queuemanager/AsyncQueueManager.java
@@ -37,6 +37,9 @@ public class AsyncQueueManager implements Runnable {
     
     public boolean contains(String player) {
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> String wrapper
         return queue.contains(new EqualString(player));
     }
     
@@ -52,9 +55,12 @@ public class AsyncQueueManager implements Runnable {
             }
             return false;
         }
+<<<<<<< HEAD
 =======
         return queue.contains(player);
 >>>>>>> One per player
+=======
+>>>>>>> String wrapper
     }
 
 }
diff --git a/src/main/java/com/gmail/nossr50/database/queuemanager/McRankAsync.java b/src/main/java/com/gmail/nossr50/database/queuemanager/McRankAsync.java
index 646188511..5138aeaac 100644
--- a/src/main/java/com/gmail/nossr50/database/queuemanager/McRankAsync.java
+++ b/src/main/java/com/gmail/nossr50/database/queuemanager/McRankAsync.java
@@ -63,11 +63,16 @@ public class McRankAsync implements Queueable {
 =======
     
     @Override
+<<<<<<< HEAD
     public boolean equals(Object obj) {
         if (obj instanceof String) {
             return ((String)obj).equalsIgnoreCase(player);
         }
         return false;
 >>>>>>> One per player
+=======
+    public String getPlayer() {
+        return player;
+>>>>>>> String wrapper
     }
 }
diff --git a/src/main/java/com/gmail/nossr50/database/queuemanager/McTopAsync.java b/src/main/java/com/gmail/nossr50/database/queuemanager/McTopAsync.java
index e0106830a..6b714594f 100644
--- a/src/main/java/com/gmail/nossr50/database/queuemanager/McTopAsync.java
+++ b/src/main/java/com/gmail/nossr50/database/queuemanager/McTopAsync.java
@@ -68,6 +68,7 @@ public class McTopAsync implements Queueable {
     }
 
     @Override
+<<<<<<< HEAD
 <<<<<<< HEAD
     public String getPlayer() {
         return player;
@@ -81,4 +82,10 @@ public class McTopAsync implements Queueable {
         return false;
     }
 >>>>>>> One per player
+=======
+    public String getPlayer() {
+        return player;
+    }
+
+>>>>>>> String wrapper
 }