In the event of any conflict between the requirements of the Code herein adopted and the requirements of any other code adopted by the City or of any local ordinance, that provision which establishes the greater restriction or higher standard shall prevail.