White, who had announced last week he was leaving the Rio Grande Valley Vipers to wait out the rest of the season because of the conflict, confirmed Monday he was rejoining the D-League team, SI.com reported.
The website said White called the dispute a "miscommunication with [the] Houston Rockets" and that it had been "cleared up."
"I'm very appreciative with how they handled this. Thank you!" the 21-year-old rookie wrote on Twitter. "If I'd left the Vipers for no valid reason [and] simply [because] I was just angry... there would've been discipline. Again, [thank you] Houston Rockets!"
White -- who has a fully guaranteed $1.6 million deal for 2012-13 and $1.7 million for next year -- had been averaging 9.6 points, 5.6 rebounds and 3.3 assists in 25.9 minutes per game in his 12 appearances for the Vipers, the website reported.
He has yet to appear in a game for the Rockets this season.
White says he suffers from generalized anxiety disorder, obsessive compulsive disorder, panic attacks and a fear of flying.
2014: The Year in Music [PHOTOS]