Fix merge conflicts

Author: Foereaper

methods/TrinityCore/GuildMethods.h

@@ -140,7 +140,7 @@ namespace LuaGuild
         Player* player = E->CHECKOBJ<Player>(2);
 
 #if ELUNA_EXPANSION < EXP_RETAIL
-        guild->HandleSetLeader(player->GetSession(), player->GetName());
+        guild->HandleSetNewGuildMaster(player->GetSession(), player->GetName());
 #else
         guild->HandleSetNewGuildMaster(player->GetSession(), player->GetName(), false);
 #endif

methods/TrinityCore/UnitMethods.h

@@ -2223,7 +2223,7 @@ namespace LuaUnit
             args.TriggerFlags = TRIGGERED_FULL_MASK;
         if (castItem)
             args.SetCastItem(castItem);
-#if ELUNA_EXPANSION < RETAIL
+#if ELUNA_EXPANSION < EXP_RETAIL
         if (originalCaster)
 #else
         if (&originalCaster)