Bayern Munich president Uli Hoeness and coach Louis van Gaal have agreed to draw a line under their simmering row that had threatend to derail the club's recent upturn in fortunes.
The pair held clear the air talks with chairman Karl-Heinz Rummenigge, vice-chairman Karl Hopfner and sporting director Christian Nerlinger as soon as they landed in Romania ahead of Wednesday clash with Cluj in the Champions League.
A Bayern statement read: "In an open discussion views were expressed and exchanged extensively. It was agreed for those present to meet together more often in future and to discuss all topics relating to Bayern Munich.
"At the end of the conversation Uli Hoeness and Louis van Gaal shook hands and agreed to work responsibly together in the future for the benefit of Bayern Munich.''
After a patchy start to the season, results have picked up of late with Bayern extending their unbeaten run to five games after Friday's 4-2 win over Freiburg, but Hoeness went on television to crticise Van Gaal on Sunday.
He said in an interview with Sky90: "It's very difficult to have a conversation with Louis van Gaal. He can't accept it when someone has a different opinion to him. However, you can't run a club all by yourself these days.''
Hoeness also questioned why the likes of Mario Gomez, Anatoliy Tymoschuk and Martin Demichelis had not played a bigger role this season after all three scored in the victory over Freiburg.
He added: "I'm watching the game from the stands and I see three players scoring who should have left the club long ago according to Louis. These players are still very useful though. Take Tymoschuk for example; he was the best man on the pitch after the break.
"There are four or five players around who have been deemed surplus to requirements, but still add something to the team. We need to keep all our players satisfied if we are to be successful.
"Louis is a very strict person. He gives you the feeling that he thinks you're a good guy, but he's having his way nonetheless. He deals with some very experienced players at Bayern and he should be a bit more cautious.''