diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
index 077fe2672..84d0b373e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java
@@ -64,22 +64,10 @@ public class Unclaim extends SubCommand {
             if ((Math.abs(plot.id.x) <= Math.abs(Auto.lastPlot.x)) && (Math.abs(plot.id.y) <= Math.abs(Auto.lastPlot.y))) {
                 Auto.lastPlot = plot.id;
             }
-<<<<<<< HEAD
         } else {
             PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
         }
-=======
-<<<<<<< HEAD
-        }
-        else {
-            PlayerFunctions.sendMessage(plr, "Plot unclaim has been denied.");
-=======
-        } else {
-            PlayerFunctions.sendMessage(plr, "Plot removal has been denied.");
->>>>>>> 73e92b834155ea9e458d7299ad78f4fd9b55aa66
-        }
         PlayerFunctions.sendMessage(plr, C.UNCLAIM_SUCCESS);
->>>>>>> drtshock-master
         return true;
     }
 }