Franck Ribery has confirmed he has cleared the air with Bayern Munich coach Louis van Gaal following their recent falling out.
French ace Ribery was publicly criticised by Van Gaal for his recent display in a friendly which had been organised to build up his fitness after an ankle injury.
Ribery responded by questioning Van Gaal's decision to comment publicly on the matter and director of sport Christian Nerlinger also became involved in the row.
However, Ribery believes relations with Van Gaal are now back on track following discussions with the coach prior to last week's UEFA Champions League game against Roma.
"Before the game in Rome, I had a long talk with him (van Gaal)," said Ribery. "We talked a lot, and that's important.
"You have to talk if you work together and want to have success, whether it is negative or positive."
Ribery played the full 90 minutes against Eintracht Frankfurt last week for the first time since his injury and is now focusing on champions Bayern's quest to catch Bundesliga leaders Borussia Dortmund.
He added: "I can feel I am getting back to fitness and I am in very good shape, mentally and physically.
"The most important thing now is to get my confidence back.
"Dortmund are a long way ahead, but we will do everything we can to win our games now. Then we'll see how far we get."