Edinson Cavani says things have been "resolved" with Neymar after the two fought over who should take a penalty in a recent match.
Paris Saint-Germain's 2-0 win over Lyon was overshadowed by the dispute, which led to Cavani taking -- and missing -- from the penalty spot.
Neymar was left upset that he wasn't allowed to take the spot kick but Cavani says things are fine between the two forwards now.
"These are things to do with football," the Uruguayan said. "Sometimes things are blown out of proportion. Everyone is aware of that. These are things that are resolved within a changing room.
"Everything has a solution and everything is calm now. The important thing is that we all fight for the same aim, whether it's with the national team or for the club."
PSG were given their first penalty since the incident at the weekend, with Neymar scoring it this time.