diff --git a/Perl-EVENT_DEATH.md b/Perl-EVENT_DEATH.md
index 7e11a48..4835104 100644
--- a/Perl-EVENT_DEATH.md
+++ b/Perl-EVENT_DEATH.md
@@ -9,16 +9,6 @@ killer_skill|int|
 ### Example
 ```perl
 sub EVENT_DEATH {
-<<<<<<< HEAD
-	quest::say($killer_id); #returns int
-	quest::say($killer_damage); #returns int
-	quest::say($killer_spell); #returns int
-	quest::say($killer_skill); #returns int
-}
-```
-
-Generated On 2018-01-15T21:55:40-08:00
-=======
 	quest::say($killer_id); # returns int
 	quest::say($killer_damage); # returns int
 	quest::say($killer_spell); # returns int
@@ -26,5 +16,4 @@ Generated On 2018-01-15T21:55:40-08:00
 }
 ```
 
-Generated On 2018-01-15T22:01:49-08:00
->>>>>>> Added Events
+Generated On 2018-01-15T22:01:49-08:00
\ No newline at end of file