diff --git a/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs b/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
index b59b8c5..3c3b99c 100644
--- a/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
+++ b/Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs
@@ -147,11 +147,10 @@ namespace Server.Gumps
 			AddButton( 140, 32, 0x15E1, 0x15E5, 101, GumpButtonType.Reply, 0 );
 
 			AddLabel( 15, 60, 52, "Tip:" );
-<<<<<<< HEAD
-			AddHtml( 15, 80, 200, 110, "This will REMOVE the spawners, in a specified region. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
-=======
+
+			AddHtml( 15, 80, 200, 110, "This will REMOVE the spawners, in a specified region. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Config/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+
 			AddHtml( 15, 80, 200, 110, "This will REMOVE the spawners, in a specified region. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Config/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
->>>>>>> main
 		}
 
 		public override void OnResponse(NetState state, RelayInfo info)