Pretty much this. Though the Juubi was her will to reclaim the chakra that Hagoromo and Hamura inherited. So it would be safe to say it "merged" back with her.Madara was Juubi's Jinchuuriki < Kaguya took over Madara < Kaguya is Juubi's Jinchuuriki.