Nadal, Federer rejoin in battle for supremacy