District Attorney's Office resolved conflict of interest case against Supervisor Leticia Perez