Bayern Munich CEO Karl-Heinz Rummenigge has said "everything is wonderful" with Jerome Boateng after holding talks with the defender.
Rummenigge criticised Boateng's performances and lifestyle after Bayern's Champions League defeat at Rostov, saying he needed to "come back to earth a little."
The 28-year-old responded by saying his poor performance in Russia had "nothing to do with any PR or lifestyle obligations" and added that he "could only laugh" at Rummenigge's comments.
But following Bayern's 3-1 win at Mainz on Friday, Rummenigge told reporters: "We talked this week and everything is resolved. Everything is wonderful between us."
Germany international Boateng was voted Man of the Year by GQ magazine in Germany, while rapper Jay Z advises him on his U.S. marketing efforts.
Meanwhile, Robert Lewandowski's agent Maik Barthel has confirmed that the Poland international striker is on the verge of sealing a new deal to keep him at the club until 2021.
"It won't be long until he signs," Barthel told kicker.
Lewandowski, 28, scored twice at Mainz to take his league tally to nine for the season.