diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
index afd21df08..41d534ceb 100644
--- a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java
@@ -298,11 +298,7 @@ public final class CommandUtils {
             String playerName = offlinePlayer.getName();
             
             if (playerName == null) { //Do null checking here to detect corrupted data before sending it throuogh .equals
-<<<<<<< HEAD
             	System.err.println("[McMMO] Player data file with UIID " + offlinePlayer.getUniqueId() + " is missing a player name. This may be a legacy file from before bukkit.lastKnownName. This should be okay to ignore.");
-=======
-            	System.err.println("[McMMO] Bad player data file with UIID " + offlinePlayer.getUniqueId() );
->>>>>>> 848080b413785a6f4d31e7760e1238bb7536b24b
             	continue; //Don't let an error here interrupt the loop
             }