diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm
index 23c9509af6..840249512a 100644
--- a/code/modules/events/event_dynamic.dm
+++ b/code/modules/events/event_dynamic.dm
@@ -186,13 +186,10 @@ var/list/event_last_fired = list()
 	active_with_role["AI"] = 0
 	active_with_role["Cyborg"] = 0
 	active_with_role["Janitor"] = 0
-<<<<<<< HEAD
-	active_with_role["Gardener"] = 0
-	active_with_role["HOS"] = 0
-	active_with_role["Warden"] = 0
-=======
 	active_with_role["Botanist"] = 0
->>>>>>> 298774524c4... Merge pull request #12368 from Heroman3003/event-min-jobs
+	active_with_role["HOS"] = 0 //CHOMP Add
+	active_with_role["Warden"] = 0 //CHOMP Add
+	active_with_role["Cargo"] = 0 //CHOMP Add
 
 	for(var/mob/M in player_list)
 		if(!M.mind || !M.client || M.client.is_afk(10 MINUTES)) // longer than 10 minutes AFK counts them as inactive
@@ -233,18 +230,16 @@ var/list/event_last_fired = list()
 		if(M.mind.assigned_role == "Janitor")
 			active_with_role["Janitor"]++
 
-<<<<<<< HEAD
-		if(M.mind.assigned_role == "Gardener")
-			active_with_role["Gardener"]++
-			
-		if(M.mind.assigned_role == "Head of Security")
-			active_with_role["Head of Security"]++
-			
-		if(M.mind.assigned_role == "Warden")
-			active_with_role["Warden"]++
-=======
 		if(M.mind.assigned_role == "Botanist")
 			active_with_role["Botanist"]++
->>>>>>> 298774524c4... Merge pull request #12368 from Heroman3003/event-min-jobs
+			
+		if(M.mind.assigned_role == "Head of Security") //CHOMP Add
+			active_with_role["Head of Security"]++ //CHOMP Add
+			
+		if(M.mind.assigned_role == "Warden") //CHOMP Add
+			active_with_role["Warden"]++ //CHOMP Add
+
+		if(M.mind.assigned_role == "Cargo") //CHOMP Add
+			active_with_role["Cargo"]++ //CHOMP Add
 
 	return active_with_role