Any municipal ordinance, resolution, or motion duly approved by the City Council which is in effect at the time this Charter is made effective shall continue in force unless it is in conflict with any provision of this Charter, at which time it shall become null and void.