merge of TrinityCore