That the existing comprehensive zoning ordinance and map, any amendments thereto, and any other ordinance of the City of Wilmer, Texas, in conflict with the provisions of this ordinance is hereby repealed.