TFF steps in to resolve Simba dispute, Jan 3 poll remains on course