Nairobi Governor Mike Sonko and Nairobi Metropolitan Service Director General Mohammed Badi have ended their feud and vowed to work together for the development of Nairobi.