The Oakland City Council has ended months of controversy by voting to approve a compromise that gives part of the city's garbage contract to a local company and part to Waste Management, the country's largest waste hauler. In voting on Monday night to split the contract between Waste Management and California Waste Solutions of Oakland, the council reversed its vote on Aug. 13 to award the entire $1 billion garbage contract for the next 10 years to California Waste Solutions.