diff --git a/README.md b/README.md
index e297534..47c3d18 100644
--- a/README.md
+++ b/README.md
@@ -4,20 +4,27 @@
 
 ## Description
 
-This is a phased guild house system for Azerothcore, it allows players to from the same guild to visit their guild house to explore, train ect
-All guilds will get their own phasing system which then the guild master will have to purchase NPC's creatures and other stuff to complete the creation. 
+This is a phased guild house system for Azerothcore, it allows players to from the same guild to visit their guild house.
+All guilds will get their own phasing system which then the guild master will have to purchase NPC's creatures and other stuff to complete the creation.
 
+### Purchasables
+
+* Class Trainers (all available in Wrath)
+* Primary Profession Trainers (all available in Wrath)
+* Secondary Profession Trainers (all available in Wrath)
+* Vendors: Reagents, Food & Water and Trade Goods
+* Portals to Neutral, Horde and Alliance cities
+* Spirit Healer
+* Guild Bank and Personal Bank access
+* Auctioneer
 
 ## How to use ingame
-Once a player has brought a guild house from the NPC they can either teleport to the guildhouse by via the NPC or do .guildhouse tele
-
-Once the player is in the location of the guild house the guild master has a command .guildhouse spawnnpc this will allow the guild master
-to start placing objects / npc within the guild house.
+1) Purchase a guild house from the NPC (entry:55005), then either teleport to the guildhouse via the NPC or chat: `.guildhouse tele`
+2) Once the player is in the location of the guild house the guild master has a command .guildhouse spawnnpc this will load the Guild House Assistant.
+3) Speak with the Guild House Assistant to begin purchasing objects
 
 ## Requirements
 
-My new module requires:
-
 - AzerothCore v1.0.1+
 
 ## Installation
@@ -28,9 +35,9 @@ My new module requires:
 3) Apply the guildhouse.patch to your source 
 4) Re-run cmake and launch a clean build of AzerothCore.
 ```
-## Patch Information
+## Patch Information (guildhouse.patch)
 
-The patch basicly turns the selected area from a bitmask to a uint, this fixes the issues with the phasing
+The patch basically turns the selected area from a bitmask to a uint, this fixes the issues with the phasing
 
 Before Patch :
 Guild 1 Can see phase 1
@@ -46,7 +53,8 @@ If you need to change the module configuration, go to your server configuration
 
 ## Credits
 
-* [Me](https://github.com/talamortis) (author of the module)
+* [Talamortis](https://github.com/talamortis) (Original author of the module)
 * [Rochet2](https://github.com/Rochet2/): Thanks for the help with the phasing situation & General support
+* [Anhanga](https://github.com/rbedfordpro)
 
-AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/PaqQRkd)
+AzerothCore: [repository](https://github.com/azerothcore) - [website](http://azerothcore.org/) - [discord chat community](https://discord.gg/64FH6Y8)
diff --git a/sql/world/Creatures.sql b/sql/world/Creatures.sql
index 989e552..8057fd9 100644
--- a/sql/world/Creatures.sql
+++ b/sql/world/Creatures.sql
@@ -1,5 +1,12 @@
+<<<<<<< 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/src/mod_guild_house_npc.cpp b/src/mod_guild_house_npc.cpp
index 0240e32..287a2d3 100644
--- a/src/mod_guild_house_npc.cpp
+++ b/src/mod_guild_house_npc.cpp
@@ -170,7 +170,8 @@ public:
         case 33618: // Skinning
         case 33608: // Alchemy
         case 33616: // Herbalism
-        case 33613: // Tailoring
+      
+            case 33613: // Tailoring
         case 33619: // Cooking
         case 33623: // Fishing 
         case 33621: // First Aid