Federer smooths over rift with Tomic