Waiguru, Ngirici make truce, commit to good working relationship