Barcelona coach Xavi insists Ilkay Gundogan and Ronald Araujo are okay after this week's Champions League hammering by PSG.
The pair have publicly exchanged barbs through the press after the defeat.
But ahead of today's El Clasico against Real Madrid, Xavi said: "When there is no bad intention, there is no problem. Everything is settled.
"It's solved. I didn't see a problem anymore, but by talking people understand each other and it's been solved.
"Tomorrow we have the opportunity to connect to LaLiga. It becomes the most important game of the season. We will find a strong Madrid and even more so after eliminating the best team in the world, City.
"Euphoria through the roof and a very strong rival. Today we trained well, yesterday we were hungover from the Champions League. The team is eager to fight for this league.
"We have extraordinary respect for Real Madrid. We are four points less than last season when we were leaders. We are going to give up everything to try to compete against a great team."
