City votes to consolidate elections