All ordinances or resolutions or parts thereof in conflict with the provisions of this ordinance are hereby repealed insofar as they conflict therewith.