Franck Ribery does not want to leave Bayern Munich and insists his row with Arjen Robben is now in the past.
Ribery was involved in a dressing room bust-up with Robben during half-time of April's UEFA Champions League semi-final first leg against Real Madrid after a dispute over a free-kick.
But France international Ribery has now followed Dutchman Robben in announcing they have made up following the argument and Bayern's interests are the priority for the future.
Ribery told Bild: "Everyone in our squad needs to know it has to be a non-issue who takes free-kicks in the future.
"It's about three points at the end of every match and the points are all that matters. Bayern Munich is neither FC Ribery nor is it FC Robben.
"We all need to cool down our egos to be successful as a team, to win matches, to capture trophies. I am unable to accept defeat.
"We need to be back out on the pitch without having concerns about ourselves. This is the mantra I want to stand for in the future."
There had been some speculation Ribery could leave Champions League finalists and Bundesliga runners-up Bayern as a result of the Robben quarrel.
But the 29-year-old, who is under contract until the summer of 2015, said: "I am able to imagine ending my career at Bayern Munich one day.
"I am convinced I could not be happier at any other club. In general, this club is a better club than Barcelona or Real Madrid."