Nairobi County and Kenya Power have resolved their longstanding KSh 4.9 billion wayleave dispute, paving the way for the restoration of normal services.