diff --git a/ReallifeGamemode.Server/Events/PlayerEvent.cs b/ReallifeGamemode.Server/Events/PlayerEvent.cs
index be41924c..06ab2550 100644
--- a/ReallifeGamemode.Server/Events/PlayerEvent.cs
+++ b/ReallifeGamemode.Server/Events/PlayerEvent.cs
@@ -9,13 +9,10 @@ namespace ReallifeGamemode.Server.Events
 {
   internal class PlayerEvent : Script
   {
-<<<<<<< HEAD
-=======
     [ServerEvent(Event.PlayerDamage)]
     public void OnPlayerDamage(Player player, float healthLoss, float armorLoss){
     }
 
->>>>>>> 294e2537... NODMZONE ZUM TESTEN
     [RemoteEvent("CLIENT:SET_InFrontOfPos")]
     public void SetFrontOfPos(Player player, Vector3 pos)
     {