diff --git a/code/modules/events/grubinfestation_vr.dm b/code/modules/events/grubinfestation_vr.dm
index 7974c58f7a..82291fc522 100644
--- a/code/modules/events/grubinfestation_vr.dm
+++ b/code/modules/events/grubinfestation_vr.dm
@@ -11,14 +11,8 @@
 	spawncount = rand(2 * severity, 6 * severity)
 
 	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in machines)
-<<<<<<< HEAD
-		//CHOMPEdit: Added a couple areas to the exclusion. Also made this actually work.
-		var/in_area = get_area(temp_vent)
-		if(istype(in_area, /area/crew_quarters/sleep) || istype(in_area, /area/hallway/secondary/entry))
-=======
 		var/area/A = get_area(temp_vent)
 		if(A.forbid_events)
->>>>>>> eb06a4b9e2... Merge pull request #13220 from Heroman3003/forbid-events
 			continue
 		if(!temp_vent.welded && temp_vent.network && (temp_vent.loc.z in using_map.station_levels))
 			if(temp_vent.network.normal_members.len > 10) //CHOMP Edit: Most our networks are 40. SM is 4 and toxins is 2. This needed to change in order to spawn.