diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index f1852ed0..7d3769c4 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -377,11 +377,8 @@ namespace TShockAPI
                             }
                         }
                 }
-<<<<<<< HEAD
                 else if (e.MsgID == 0x22) // Client only KillTile
                     e.Handled = true; // Client only uses it for chests, but sends regular 17 as well.
-=======
->>>>>>> master
             }
             catch (Exception ex)
             {