Tennis: Federer, Nadal smooth over talk of rift