diff --git a/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs b/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
index 3c3b99c..136277e 100644
--- a/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
+++ b/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
@@ -423,8 +423,5 @@ namespace Server.Gumps
 			}
 		}
 	}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> main
+