Real Madrid star Dani Ceballos has revealed new Spain head coach Luis de la Fuente told him and Gavi to settled their differences after the pair clashed in recent Clasicos.
The midfielders have both joined up with the Spain national team ahead of their opening Euro 2024 qualification matches.
Ceballos said De la Fuente had been aware of incidents between the pair and instructed the midfielders to talk prior to the international camp.
'The coach was aware that we had had our ups and downs,' Ceballos told Marca. 'He told us to talk about it, and that is what we have done.
'It's all working out, we have discussed it.
'Everything that happens on the pitch stays there. We have to go in the same direction.
'If the good atmosphere and good vibes aren't there, I'm not going to run for him on the pitch and he's not going to run for me. This must be put to one side.
'We share the same position. Now we are partners.'
The latest incident between Ceballos and Gavi came during El Clasico on Sunday, with the Barcelona teenager taking out his Real Madrid rival off the ball.
Ceballos had appeared to kick-out at Barca striker Robert Lewandowski, prompting Gavi to barge into his back and leave the former Arsenal player on the floor.
Real Madrid fans called for Gavi to be shown the red card for the shove, but the 18-year-old avoided punishment for the incident.
The incident came late on in the crucial match, which Barcelona went on to win 2-1 to take a potentially decisive 12-point lead at the top of the table.
It was not the first time the two Spaniards have clashed on the pitch. The pair have previous, from when the famous rivals met in the Spanish Super Cup Final in January.
On as a late substitute and with Madrid 3-0 down, Ceballos grabbed a load of Gavi's hair sparking a row between sets of players from both clubs.
De la Fuente's intervention appears an attempt to cool any tension between players from Barcelona and Real Madrid, which could cause division within the national team set-up.
The 61-year-old is preparing to take charge of his first matches as coach of the senior team.
De la Fuente was promoted from his role as under-21 head coach in December, following Spain's shock last-16 exit to Morocco at the World Cup in Qatar, which prompted Luis Enrique's sacking.
Spain will begin their Euro 2024 qualifying campaign by hosting Norway on Saturday, before facing Scotland on March 28.