diff --git a/wadsrc/static/mapinfo/common.txt b/wadsrc/static/mapinfo/common.txt
index 500e9b3c7..1c1559b06 100644
--- a/wadsrc/static/mapinfo/common.txt
+++ b/wadsrc/static/mapinfo/common.txt
@@ -114,9 +114,6 @@ DoomEdNums
   9842 = SpotLightFlicker
   9843 = SectorSpotLight
   9844 = SpotLightFlickerRandom
-<<<<<<< Updated upstream
-=======
-<<<<<<< HEAD
   9850 = SpotLightAdditive
   9851 = SpotLightPulseAdditive
   9852 = SpotLightFlickerAdditive
@@ -132,9 +129,6 @@ DoomEdNums
   9872 = SpotLightFlickerAttenuated
   9873 = SectorSpotLightAttenuated
   9874 = SpotLightFlickerRandomAttenuated
-=======
->>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
->>>>>>> Stashed changes
   9982 = SecActEyesAboveC
   9983 = SecActEyesBelowC
   9988 = CustomSprite
diff --git a/wadsrc/static/zscript/shared/dynlights.txt b/wadsrc/static/zscript/shared/dynlights.txt
index 59584bb23..c2c005bd8 100644
--- a/wadsrc/static/zscript/shared/dynlights.txt
+++ b/wadsrc/static/zscript/shared/dynlights.txt
@@ -245,9 +245,6 @@ class SpotLightFlickerRandom : SpotLight
 		DynamicLight.Type "RandomFlicker";
 	}
 }
-<<<<<<< Updated upstream
-=======
-<<<<<<< HEAD
 
 class SpotLightAdditive : SpotLight
 {
@@ -368,9 +365,6 @@ class SpotLightFlickerRandomAttenuated : SpotLightFlickerRandom
 		+DYNAMICLIGHT.ATTENUATE
 	}
 }
-=======
->>>>>>> 7f7c720883e6841ced9c5e66cdae5e6b531872ad
->>>>>>> Stashed changes
 
 class VavoomLight : DynamicLight 
 {