Fixed merge errors

src/server/game/Battlegrounds/ArenaTeam.h

@@ -141,6 +141,8 @@ class ArenaTeam
 
         size_t GetMembersSize() const         { return Members.size(); }
         bool   Empty() const                  { return Members.empty(); }
+        MemberList::iterator m_membersBegin() { return Members.begin(); }
+        MemberList::iterator m_membersEnd()   { return Members.end(); }
         bool IsMember(uint64 guid) const;
 
         ArenaTeamMember* GetMember(uint64 guid);

src/server/scripts/Commands/cs_misc.cpp

@@ -1717,12 +1717,6 @@ public:
         {
             Field* fields = result3->Fetch();
             xptotal       = fields[0].GetUInt32();
-            case RACE_GOBLIN:
-                raceStr = "Goblin";
-                break;
-            case RACE_WORGEN:
-                raceStr = "Worgen";
-                break;
         }
 
         // Can be used to query data from Characters database