County and city agree to combine Nov. elections