A controversial Misty Waters zoning change has been approved after months of work from Bismarck city staff and public debate, ending a yearslong rear yard setback dispute.