Charles Oliveira insists his rematch with Islam Makhachev will be the next lightweight title fight after UFC 311.