No, local ordinance is trumped by state law, just as state law is trumped by federal law.So... My brain just tied in a knot. The local ordinances have previously been under a State law?
If the GAAMPs get changed as proposed, that means that your city or township can make you get rid of your birds if they want to. Even if you are currently allowed to have them.
If you are still confused, PM me your phone number and I can walk you though it in plain language. That may be easier than typing out the years of legalities.