It’s been two weeks since Neymar and Edinson Cavani clashed during Paris Saint-Germain’s 2-0 victory over Lyon.

The two superstars first argued over who would take a free-kick before another discussion took place when they were awarded a penalty.

But that was just the start of it.

Numerous media reports followed in the coming days that may have made a mountain out of a molehill.

The reports included: The pair clashing in the dressing room afterward, Neymar unfollowing Cavani on social media, Neymar demanding Cavani is sold and Cavani being offered €1 million to give penalties to Neymar.

How many of those reports were actually true is unknown.

But there was only one way Neymar and Cavani would put an end to this saga - by doing their talking on the pitch.

On Wednesday, they both scored during PSG’s 3-0 victory over Bayern Munich in the Champions League while they were seen hugging and shaking hands.

But people were still waiting to see what happens when they were next awarded a penalty. And exactly that happened against Bordeaux on Saturday.

Unai Emery’s side ran out convincing 6-2 winners and, with the scores at 3-1, they were awarded a spot-kick.

But who would take it?

Well, as soon as the penalty was awarded, Cavani retreated to the edge of the penalty box as clearly stood back to let Neymar take it.

And as soon as the Brazilian converted, he turned around and hugged the Uruguayan.

Watch: Neymar scores penalty - and hugs Cavani

The saga is well and truly over.

But how did they decide who took the spot-kick?

How did they decide?

Both players had already got themselves on the scoresheet so why did Neymar get priority?

Well, PSG right-back Thomas Munier has revealed all.

"It was arranged with the coach before today," Meunier told reporters, per the Mirror.

"If there had been another penalty, it would have been for Edi (Cavani)."

Very interesting.

Neymar on his 'feud' with Cavani

Even before the match, Neymar played down all the reports of his feud with Cavani by criticising the media.

They invent a lot of stories," he told reporters.

"They talk too much. They speak about things that they have no clue about. They try to infiltrate the dressing room and end up claiming things that do not exist."

That’s the end of that, then.