A conflict between the base district requirements and an historic overlay district shall be resolved in accordance with the provisions of this Chapter and the City Administrative Code, Codified Ordinance Sections 101.06 (Conflicting Provisions) and 101.07 (Legislative Intent).