Djokovic, Nadal showdown still on