Even with deal, tension escalates between SF district and te