Roger Federer has sought to play down his spat with Stanislas Wawrinka by tweeting a conciliatory message with his compatriot on Monday night. Federer and Wawrinka had a 10-minute row on Saturday, after the world No 2's wife 'heckled' his opponent from the sidelines during their match. But the Swiss stars, who will play together this weekend in the Davis Cup final, appeared to have settled their differences just 48 hours after the dispute. Roger Federer (centre) and Stanisals Wawrinka (second right) appeared to have settled their differences Wawrinka trained in Lille ahead of the Davis Cup final, where he will play alongside Federer
@highlight
Roger Federer tweeted 'It's great being with the boys again' on Monday
@highlight
Federer pulled out of the ATP Tour Finals final on Sunday
@highlight
Winner Novak Djokovic was left to face Andy Murray in an exhibition
@highlight
Federer argued with Stan Wawrinka backstage after their semi-final
@highlight
The pair had a 10-minute row in a room which was being used as a gym
@highlight
Wawrinka was angry about comments made by Federer's wife Mirka
@highlight
The Swiss duo will represent their country in the Davis Cup final this week
@placeholder and Roger, who first met in 2000 and married in 2009, have two sets of twins together