Electricity minister Kgosientsho Ramokgopa steps in to resolve Eskom and City Power billing dispute