Within the South Subdistrict, for M1 Districts mapped with a Residence District, the provisions of Article XII, Chapter 3 (Special Mixed Use District) for waterfront blocks shall apply, except as modified in this Chapter. In the event of a conflict between the provisions of Article XII, Chapter 3 and this Chapter, the provisions of this Chapter shall control.