Roger Federer (centre) and Stanisals Wawrinka (second right) appeared to have settled their differences