diff --git a/sql/world/Creatures.sql b/sql/world/Creatures.sql
index 8057fd9..212e367 100644
--- a/sql/world/Creatures.sql
+++ b/sql/world/Creatures.sql
@@ -1,12 +1,4 @@
-<<<<<<< HEAD
 REPLACE INTO `creature_template` VALUES (70101, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Xrispins', 'Guild House Seller', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSeller', 12340),
 (18649, 0, 0, 0, 0, 0, 18234, 0, 0, 0, 'Innkeeper Angela', NULL, NULL, 0, 1, 2, 0, 35, 65537, 0.8, 0.28571, 1, 0, 2, 2, 0, 26, 4.6, 2000, 1900, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 100, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 3, 1, 1, 1, 1, 0, 70, 1, 0, 2, 'npc_innkeeper', 12340),
 (33251, 0, 0, 0, 0, 0, 28516, 0, 0, 0, 'Death Knight Trainer', '', '', 9691, 80, 80, 2, 35, 51, 1, 1.14286, 1, 1, 422, 586, 0, 642, 7.5, 2000, 2000, 1, 32768, 2048, 0, 0, 0, 0, 6, 0, 345, 509, 103, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 10, 1, 1, 0, 0, 1, 8388624, 0, '', 12340),
 (70102, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Rapidomuerte', 'Guild House Assistant', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSpawner', 12340);
-=======
-REPLACE INTO `creature_template` VALUES (70101, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Talamortis', 'Guild House Seller', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSeller', 12340),
-(18649, 0, 0, 0, 0, 0, 18234, 0, 0, 0, 'Innkeeper Monica', NULL, NULL, 0, 1, 2, 0, 35, 65537, 0.8, 0.28571, 1, 0, 2, 2, 0, 26, 4.6, 2000, 1900, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 1, 100, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 1, 3, 1, 1, 1, 1, 0, 70, 1, 0, 2, 'npc_innkeeper', 12340),
-(33251, 0, 0, 0, 0, 0, 28516, 0, 0, 0, 'Death Knight Trainer', '', '', 9691, 80, 80, 2, 35, 51, 1, 1.14286, 1, 1, 422, 586, 0, 642, 7.5, 2000, 2000, 1, 32768, 2048, 0, 0, 0, 0, 6, 0, 345, 509, 103, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 10, 1, 1, 0, 0, 1, 8388624, 0, '', 12340),
-(70102, 0, 0, 0, 0, 0, 25901, 0, 0, 0, 'Speedfang', 'Guild House Assistant', '', 0, 35, 35, 0, 35, 1, 1, 1.14286, 1, 0, 49, 64, 0, 118, 1, 2000, 2000, 1, 33536, 2048, 0, 0, 0, 0, 0, 0, 33, 49, 11, 7, 4096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 3, 1, 1, 1, 1, 0, 0, 1, 0, 0, 'GuildHouseSpawner', 12340);
->>>>>>> 9ffd5adbbb2071bb539e752a15b4ecd3d62a9d7b
-
diff --git a/sql/world/guild_house_spawns.sql b/sql/world/guild_house_spawns.sql
index 19d392f..c9e33eb 100644
--- a/sql/world/guild_house_spawns.sql
+++ b/sql/world/guild_house_spawns.sql
@@ -44,7 +44,7 @@ CREATE TABLE IF NOT EXISTS `guild_house_spawns` (
   UNIQUE KEY `entry` (`entry`)
 ) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8;
 
--- Dumping data for table acore_world.guild_house_spawns: ~29 rows (approximately)
+-- Dumping data for table acore_world.guild_house_spawns: ~48 rows (approximately)
 /*!40000 ALTER TABLE `guild_house_spawns` DISABLE KEYS */;
 REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orientation`, `comment`) VALUES
 	(1, 26327, 16216.5, 16279.4, 20.9306, 0.552869, 'Paladin Trainer'),
@@ -93,8 +93,9 @@ REPLACE INTO `guild_house_spawns` (`id`, `entry`, `posX`, `posY`, `posZ`, `orien
 	(49, 29715, 16223.7, 16293.3, 20.852, 4.57958, 'Food & Drink'),
     (50, 6491, 16319.937, 16242.404, 24.4747, 2.206830, 'Spirit Healer'),
     (51, 191028, 16255.5, 16304.9, 20.9785, 2.97516, 'Barber Chair (Object)'),
-    (52, 191013, 16203, 16216, 1.10669, 1.0453, 'Portal: Shattrath (Object)'),
-    (53, 29636, 16233.5, 16316.1, 20.8455, 3.07558, 'Reagent Vendor');
+    (52, 191013, 16203, 16216, 1.10669, 1.0453, 'Portal: Shattrath (Object) - Alliance'),
+    (53, 29636, 16233.5, 16316.1, 20.8455, 3.07558, 'Reagent Vendor'),
+    (54, 191014, 16203, 16216, 1.10669, 1.0453, 'Portal: Shattrath (Object) - Horde');
 	
 /*!40000 ALTER TABLE `guild_house_spawns` ENABLE KEYS */;
 
diff --git a/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp
index f27905a..673b96d 100644
--- a/src/mod_guild_house_npc.cpp
+++ b/src/mod_guild_house_npc.cpp
@@ -219,7 +219,8 @@ public:
         case 183324: // Silvermoon Portal
         case 183321: // Exodar Portal
         case 191164: // Dalaran Portal
-        case 191013: // Shattrath Portal
+        case 191013: // Shattrath Portal:Alliance
+        case 191014: // Shattrath Portal:Horde
             cost = GuildHousePortal;
             SpawnObject(action, player);
             break;
diff --git a/src/mod_guild_house_v2.cpp b/src/mod_guild_house_v2.cpp
index 7ea2039..0a1ac76 100644
--- a/src/mod_guild_house_v2.cpp
+++ b/src/mod_guild_house_v2.cpp
@@ -73,7 +73,7 @@ public:
         return true;
     }
 
-    bool OnGossipSelect(Player *player, Creature * m_creature, uint32 sender, uint32 action)
+    bool OnGossipSelect(Player *player, Creature * m_creature, uint32, uint32 action)
     {
         uint32 map;
         float posX;
@@ -197,7 +197,8 @@ public:
         else
             player->SetPhaseMask(GetNormalPhase(player), true);
     }
-
+/*
+    // WIP - Anhanga, per Stoabrogga suggestion
     uint32 GetNormalPhase(Player* player) const
     {
         if (player->IsGameMaster())
@@ -212,6 +213,18 @@ public:
 
         return PHASEMASK_NORMAL;
     }
+*/
+    uint32 GetNormalPhase(Player* player) const
+    {
+        if (player->IsGameMaster())
+            return PHASEMASK_ANYWHERE;
+
+        uint32 phase = player->GetPhaseByAuras();
+        if (!phase)
+            return PHASEMASK_NORMAL;
+        else
+            return phase;
+    }
 
     void CheckPlayer(Player* player)
     {