Ghanaian born-German player Jerome Boateng has held talks with Bayern Munich chairman Karl-Heinz Rummenigge.
Rummenigge questioned the centre-back's form in the wake of Bayern's disappointing 3-2 defeat to Rostov in the Champions League last month, urging the Germany international to come "back to earth".
Boateng took exception to the comments and responded in an interview with Sky, saying: "I can only laugh about these statements.
"Next time he can say it personally to my face - and then it's fine."
But Rummenigge, speaking to Bild after Bayern's 3-1 Bundesliga win at Mainz, insists the pair have patched up their differences.
"There was a discussion this week," he said. "It's all wonderful."